diff --git a/helpers/DATA/casper/set_trisquel_iso_suggestion.patch b/helpers/DATA/casper/patch_changes/000-set_trisquel_iso_suggestion.patch similarity index 100% rename from helpers/DATA/casper/set_trisquel_iso_suggestion.patch rename to helpers/DATA/casper/patch_changes/000-set_trisquel_iso_suggestion.patch diff --git a/helpers/DATA/casper/patch_changes/001-fix_disable_kde_services_triskel_live.patch b/helpers/DATA/casper/patch_changes/001-fix_disable_kde_services_triskel_live.patch new file mode 100644 index 0000000..f0e0dff --- /dev/null +++ b/helpers/DATA/casper/patch_changes/001-fix_disable_kde_services_triskel_live.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/casper-bottom/34disable_kde_services b/scripts/casper-bottom/34disable_kde_services +index f368ec2e..caa76986 100755 +--- a/scripts/casper-bottom/34disable_kde_services ++++ b/scripts/casper-bottom/34disable_kde_services +@@ -20,7 +20,7 @@ esac + + log_begin_msg "$DESCRIPTION" + +-for pkg in kubuntu-default-settings ubuntustudio; do ++for pkg in triskel-default-settings kubuntu-default-settings ubuntustudio; do + settingsdir="/root/usr/share/$pkg/kf5-settings" + [ -d "$settingsdir" ] || continue + printf "[Daemon]\nTimeout=0\nAutolock=false\nLockOnResume=false\n" >> "$settingsdir"/kscreenlockerrc diff --git a/helpers/make-casper b/helpers/make-casper index 816ed70..57699f1 100644 --- a/helpers/make-casper +++ b/helpers/make-casper @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=24 +VERSION=25 . ./config @@ -40,8 +40,8 @@ rm scripts/casper-bottom/33enable_apport_crashes sed "s/cut/cut -d: -f2- | cut/" -i scripts/casper-functions sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions -# Set trisquel isos as default suggestion. -patch_p1 $DATA/set_trisquel_iso_suggestion.patch +# Apply custom trisquel patches +apply_patch_changes # Enable abrowser apparmor profile cp $DATA/35apparmor_browsers scripts/casper-bottom