fix enable-persistent config and rename the others

6 files changed, 24 insertions, 2 deletions

diff --git a/config/chroot_local-includes/lib/live/config/003-sudo-trinity b/config/chroot_local-includes/lib/live/config/0030-sudo-trinity
index bfb39e5..bfb39e5 100755
--- a/config/chroot_local-includes/lib/live/config/003-sudo-trinity
+++ b/config/chroot_local-includes/lib/live/config/0030-sudo-trinity
diff --git a/config/chroot_local-includes/lib/live/config/008-kdm-trinity b/config/chroot_local-includes/lib/live/config/0080-kdm-trinity
index a924fe7..a924fe7 100755
--- a/config/chroot_local-includes/lib/live/config/008-kdm-trinity
+++ b/config/chroot_local-includes/lib/live/config/0080-kdm-trinity
diff --git a/config/chroot_local-includes/lib/live/config/800-kde-keyboard-layout b/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout
index 62e3927..62e3927 100755
--- a/config/chroot_local-includes/lib/live/config/800-kde-keyboard-layout
+++ b/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout
diff --git a/config/chroot_local-includes/lib/live/config/900-enable-persistent b/config/chroot_local-includes/lib/live/config/9000-enable-persistent
index 618ea11..0ef6a82 100755
--- a/config/chroot_local-includes/lib/live/config/900-enable-persistent
+++ b/config/chroot_local-includes/lib/live/config/9000-enable-persistent
@@ -1,8 +1,26 @@
 #!/bin/sh
+
 # "enable persistent" desktop-icon
-[ -x /usr/local/bin/enable_persistent_live.bash ] || exit 0
 
-case "$(awk '{if($2=="/live/image"){print $1;}}' /proc/mounts)" in
+Persistent ()
+{
+if [ -e /var/lib/live/config/enable-persistent ]
+then
+	return
+fi
+echo -n " enable-persistent"
+Configure_Persistent
+}
+
+Configure_Persistent ()
+{
+if ! [ -x /usr/local/bin/enable_persistent_live.bash ]
+then
+	touch /var/lib/live/config/enable-persistent 
+	return
+fi
+
+case "$(awk '{if($2=="/live/image"||$2=="/lib/live/mount/medium"){print $1;}}' /proc/mounts)" in
 /dev/sd*) 
 	case "$( ls /grub.cmdline 2>/dev/null)" in
 	/grub.cmdline)
@@ -32,3 +50,7 @@ EOF
 	;;
 esac
 
+touch /var/lib/live/config/enable-persistent
+}
+
+Persistent
diff --git a/config/chroot_local-includes/lib/live/config/900-sudo-su-alias b/config/chroot_local-includes/lib/live/config/9000-sudo-su-alias
index 56589a3..56589a3 100755
--- a/config/chroot_local-includes/lib/live/config/900-sudo-su-alias
+++ b/config/chroot_local-includes/lib/live/config/9000-sudo-su-alias
diff --git a/config/chroot_local-includes/lib/live/config/901-hotfixes b/config/chroot_local-includes/lib/live/config/9010-hotfixes
index 5cf3b53..5cf3b53 100755
--- a/config/chroot_local-includes/lib/live/config/901-hotfixes
+++ b/config/chroot_local-includes/lib/live/config/9010-hotfixes