Using consistent naming scheme for automatic generated live-config configuration...
authorDaniel Baumann <daniel@debian.org>
Thu, 24 Jan 2013 08:04:55 +0000 (09:04 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 24 Jan 2013 08:05:13 +0000 (09:05 +0100)
debian/live-config.postrm
scripts/config/0060-locales-all
scripts/config/0150-xinit
scripts/config/1150-xserver-xorg

index 7bbaacd..bca1738 100644 (file)
@@ -5,9 +5,8 @@ set -e
 case "${1}" in
        purge)
                rm -f /etc/sudoers.d/live
-               rm -f /etc/profile.d/locales-all.sh
-               rm -f /etc/profile.d/zz-live.sh
-               rm -f /etc/X11/xorg.conf.d/99-live.conf
+               rm -f /etc/profile.d/zz-live-config_*.sh
+               rm -f /etc/X11/xorg.conf.d/zz-live-config_xserver-xorg.conf
 
                rmdir --ignore-fail-on-non-empty /etc/live/config > /dev/null 2>&1 || true
                rmdir --ignore-fail-on-non-empty /etc/live > /dev/null 2>&1 || true
index 21e96ad..0949848 100755 (executable)
@@ -45,7 +45,7 @@ Configure_locales_all ()
        then
                sed -i -e "s|^ *LANG=.*|LANG=\"${LIVE_LOCALES}\"|" /etc/profile
        else
-               printf 'export LANG="%s"\n' "${_LOCALE}" > /etc/profile.d/locales-all.sh
+               printf 'export LANG="%s"\n' "${_LOCALE}" > /etc/profile.d/zz-live-config_locales-all.sh
        fi
 
        # Creating state file
index 7e36c7e..71e2329 100755 (executable)
@@ -13,7 +13,7 @@ Xinit ()
        # Checking if a display manager has been configured
        case "${_X11}" in
                true)
-                       rm -f /etc/profile.d/zz-live.sh
+                       rm -f /etc/profile.d/zz-live-config_xinit.sh
 
                        return
                        ;;
@@ -34,12 +34,12 @@ Xinit ()
 Configure_xinit ()
 {
        # Checking if package is already configured differently
-       if [ -e /etc/profile.d/zz-live.sh ]
+       if [ -e /etc/profile.d/zz-live-config_xinit.sh ]
        then
                return
        fi
 
-cat > /etc/profile.d/zz-live.sh << EOF
+cat > /etc/profile.d/zz-live-config_xinit.sh << EOF
 if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
 then
        while true
index da2cf90..20903df 100755 (executable)
@@ -164,12 +164,12 @@ Configure_xserver_xorg ()
                if [ -e "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" ]
                then
                        # xorg-driver manual override
-                       cp "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" /etc/X11/xorg.conf.d/99-live.conf
+                       cp "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" /etc/X11/xorg.conf.d/zz-live-config_xserver-xorg.conf
                else
 
                        # xorg-driver automatic override
 
-cat > /etc/X11/xorg.conf.d/99-live.conf << EOF
+cat > /etc/X11/xorg.conf.d/zz-live-config_xserver-xorg.conf << EOF
 Section "Device"
        Identifier      "Default screen"
        Driver          "${LIVE_XORG_DRIVER}"