--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: live-config/3.0.21-1
- From: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
- Date: Sun, 17 Feb 2013 12:11:44 -0400
- Message-id: <20130217161144.8026.43011.reportbug@shade.edennet>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package live-config
The version in wheezy was at alpha stage of development. We have, at
long last, a final release which is the only supportable version for the
lifetime of wheezy.
I have attached a cleaned up diff which lists at the top the specific
cleanups performed to make review easier.
unblock live-config/3.0.21-1
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.7-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
This is a diff 3.0~a43-1..3.0.21-1:
* without manpage translation changes
* with filenames adjusted to account for file renames providing a minimal diff
diff -Naurp live-config.orig/backends/systemd/live-config.systemd live-config/backends/systemd/live-config.systemd
--- live-config.orig/backends/systemd/live-config.systemd 2013-02-15 10:34:51.943043882 +0100
+++ live-config/backends/systemd/live-config.systemd 2013-02-15 09:38:24.060897355 +0100
@@ -8,8 +8,16 @@
[Unit]
Description=live-config contains the scripts that configure a Debian Live system during the boot process (late userspace).
+Documentation=man:live-config
+Before=basic.target
+DefaultDependencies=no
+ConditionPathExists=/lib/live/config.sh
+ConditionKernelCommandLine=boot=live
[Service]
+Type=oneshot
+RemainAfterExit=yes
ExecStart=/lib/live/config.sh
-Type=finish
-ValidNoProcess=yes
+
+[Install]
+WantedBy=basic.target
diff -Naurp live-config.orig/bin/boot-init.sh live-config/bin/boot-init.sh
--- live-config.orig/bin/boot-init.sh 2013-02-15 10:34:51.943043882 +0100
+++ live-config/bin/boot-init.sh 2013-02-15 09:38:24.060897355 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -65,14 +65,15 @@ cache_path()
get_boot_device()
{
- # search in /proc/mounts for the device that is mounted at /live/image
+ # search in /proc/mounts for the device that is mounted at /lib/live/mount/medium
while read DEVICE MOUNT REST
do
- if [ "${MOUNT}" = "/live/image" ]
- then
- echo "${DEVICE}"
- exit 0
- fi
+ case "${MOUNT}" in
+ /lib/live/mount/medium)
+ echo "${DEVICE}"
+ exit 0
+ ;;
+ esac
done < /proc/mounts
}
@@ -95,8 +96,6 @@ device_is_USB_flash_drive()
Eject ()
{
- # Exit if the system was booted from an ISO image rather than a physical CD
- grep -qs find_iso= /proc/cmdline && return 0
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
@@ -108,24 +107,25 @@ Eject ()
# "ejected" state even after reboot
MESSAGE="Please remove the USB flash drive"
- if [ "${NOPROMPT}" = "usb" ]
- then
- prompt=
- fi
-
+ case "${NOPROMPT}" in
+ usb)
+ prompt=
+ ;;
+ esac
else
# ejecting is a very good idea here
MESSAGE="Please remove the disc, close the tray (if any)"
if [ -x /usr/bin/eject ]
then
- eject -p -m /live/image >/dev/null 2>&1
+ eject -p -m /lib/live/mount/medium >/dev/null 2>&1
fi
- if [ "${NOPROMPT}" = "cd" ]
- then
- prompt=
- fi
+ case "${NOPROMPT}" in
+ cd)
+ prompt=
+ ;;
+ esac
fi
[ "$prompt" ] || return 0
@@ -143,39 +143,36 @@ Eject ()
fi
}
-# Don't prompt to eject the SD card on Babbage board, where we reuse it
-# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
-# (archdetect), but since this is mostly only relevant for
-# installations, who cares ...
-if [ -x "$(which archdetect 2>/dev/null)" ]
-then
- subarch="$(archdetect)"
-
- case $subarch in
- arm*/imx51)
- return 0
- ;;
- esac
-fi
-
echo "live-boot: caching reboot files..."
prompt=1
-if [ "${NOPROMPT}" = "Yes" ]
-then
- prompt=
-fi
+
+case "${NOPROMPT}" in
+ yes)
+ prompt=
+ ;;
+esac
for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
do
cache_path "${path}"
done
-mount -o remount,ro /live/overlay > /dev/null 2>&1
+mount -o remount,ro /lib/live/mount/overlay > /dev/null 2>&1
+
+# Remounting any persistence devices read-only
+for _MOUNT in $(awk '/\/lib\/live\/mount\/persistence/ { print $2 }' /proc/mounts)
+do
+ mount -o remount,ro ${_MOUNT} > /dev/null 2>&1
+done
+
+# Flush filesystem buffers
+sync
# Check if we need to eject the drive
if grep -qs "cdrom-detect/eject=false" /proc/cmdline || \
- grep -qs "noeject" /proc/cmdline
+ grep -qs "noeject" /proc/cmdline || \
+ grep -qs "find_iso" /proc/cmdline
then
return
else
diff -Naurp live-config.orig/bin/live-config-update live-config/bin/live-config-update
--- live-config.orig/bin/live-config-update 2013-02-15 10:34:51.943043882 +0100
+++ live-config/bin/live-config-update 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -18,7 +18,10 @@ then
exit 1
fi
-if [ ! -x "$(which lsb_release 2>/dev/null)" ]
+_DISTRIBUTION="${2:-$(lsb_release -is | tr [A-Z] [a-z] | sed -e 's| |-|g')}"
+_RELEASE="${3:-$(lsb_release -cs | tr [A-Z] [a-z])}"
+
+if ( [ -z "${_DISTRIBUTION}" ] || [ -z "${_RELEASE}" ] ) && [ ! -x "$(which lsb_release 2>/dev/null)" ]
then
echo "E: lsb_release: command not found."
echo "I: lsb_release can be optained from:"
@@ -28,9 +31,6 @@ then
exit 1
fi
-_DISTRIBUTION="$(lsb_release -is | tr [A-Z] [a-z])"
-_RELEASE="$(lsb_release -cs | tr [A-Z] [a-z])"
-
case "${_DISTRIBUTION}" in
debian)
NOSCRIPTS="apport ureadahead"
@@ -44,22 +44,34 @@ case "${_DISTRIBUTION}" in
squeeze)
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth"
;;
+
+ *)
+ NOSCRIPTS="${NOSCRIPTS} gdm module-init-tools"
+ ;;
esac
+
+ PROC_OPTIONS="onodev,noexec,nosuid"
;;
- progress)
+ progress-linux)
NOSCRIPTS="upstart apport ureadahead"
LIVE_HOSTNAME="progress"
LIVE_USERNAME="user"
- LIVE_USER_FULLNAME="Progress Linux user"
+ LIVE_USER_FULLNAME="Live user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo"
case "${_RELEASE}" in
artax|artax-backports)
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth sudo"
;;
+
+ *)
+ NOSCRIPTS="${NOSCRIPTS} gdm module-init-tools"
+ ;;
esac
+
+ PROC_OPTIONS="onodev,noexec,nosuid,hidepid=2"
;;
ubuntu)
@@ -69,10 +81,12 @@ case "${_DISTRIBUTION}" in
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Ubuntu Live user"
LIVE_USER_DEFAULT_GROUPS="adm cdrom dip lpadmin plugdev sambashare"
+
+ PROC_OPTIONS="onodev,noexec,nosuid"
;;
esac
-echo "Removing unused scripts..."
+echo "Removing unused scripts for ${_DISTRIBUTION} (${_RELEASE})..."
for NOSCRIPT in ${NOSCRIPTS}
do
@@ -82,9 +96,10 @@ do
fi
done
-echo "Setting distribution specific defaults..."
+echo "Setting specific defaults for ${_DISTRIBUTION} (${_RELEASE}..."
sed -i -e "s|^LIVE_HOSTNAME=.*$|LIVE_HOSTNAME=\"${LIVE_HOSTNAME}\"|" \
-e "s|^LIVE_USERNAME=.*$|LIVE_USERNAME=\"${LIVE_USERNAME}\"|" \
-e "s|^LIVE_USER_FULLNAME=.*$|LIVE_USER_FULLNAME=\"${LIVE_USER_FULLNAME}\"|" \
+ -e "s|^PROC_OPTIONS=.*$|PROC_OPTIONS=\"${PROC_OPTIONS}\"|" \
"$(dirname ${_DIRECTORY})/config.sh"
diff -Naurp live-config.orig/bin/live-debconfig live-config/bin/live-debconfig
--- live-config.orig/bin/live-debconfig 2013-02-15 10:34:51.943043882 +0100
+++ live-config/bin/live-debconfig 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Setup local debconf
-if [ ! -e /var/lib/live/debconfig ]
-then
- mkdir -p /var/lib/live/debconfig
- chmod 0700 /var/lib/live/debconfig
-fi
-
-if [ ! -e /var/lib/live/debconfig/systemrc ]
-then
-
-cat > /var/lib/live/debconfig/systemrc << EOF
-Config: configdb
-Templates: templatedb
-
-Name: config
-Driver: File
-Mode: 644
-Reject-Type: password
-Filename: /var/lib/live/debconfig/config.dat
-
-Name: passwords
-Driver: File
-Mode: 600
-Backup: false
-Required: false
-Accept-Type: password
-Filename: /var/lib/live/debconfig/passwords.dat
-
-Name: configdb
-Driver: Stack
-Stack: config, passwords
-
-Name: templatedb
-Driver: File
-Mode: 644
-Filename: /var/lib/live/debconfig/templates.dat
-EOF
-
-fi
-
-DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
-
-if [ "${1}" = "--noscripts" ]
-then
- exit
-fi
-
-# Run debconf scripts
-for _SCRIPT in /lib/live/debconfig/*
-do
- if [ -x "${_SCRIPT}" ]
- then
- # FIXME: make scripts a multiselect
- "${_SCRIPT}"
- fi
-done
diff -Naurp live-config.orig/debian/changelog live-config/debian/changelog
--- live-config.orig/debian/changelog 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/changelog 2013-02-15 10:34:10.452722877 +0100
@@ -1,3 +1,371 @@
+live-config (3.0.21-1) unstable; urgency=low
+
+ * Calling systemctl with --quiet.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 15 Feb 2013 09:32:13 +0100
+
+live-config (3.0.20-1) unstable; urgency=low
+
+ * Correcting systemctl call for system to enable live-config.service.
+ * Apparently lightdm doesn't do autologin with a non-zero autologin-
+ user-timeout.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 14 Feb 2013 13:11:33 +0100
+
+live-config (3.0.19-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Moving log redirection to earlier point in time to capture the
+ initialization of live-config in the logfile too.
+ * Protecting hostname setting to avoid leaving live-config completely if
+ user sets an invalid hostname.
+ * Only support hostname variables when iproute is available.
+ * Making link/inet/inet6 variables in hostnames actually working.
+ * Using internal variable for /bin/ip separator when using variables in
+ hostname to allow local customizations.
+ * Moving ip separator variable to the beginning in order to overwrite it
+ through /etc/live/config, even if it's only use no separator at all.
+ * Dropping dpkg compression level.
+ * Correcting locales-all script to only write the default locale out in
+ case more than one has been specified.
+ * Edit existing LANG setting on Progress Linux in /etc/profile rather
+ than adding a new /etc/profile.d file.
+ * Using consistent naming scheme for automatic generated live-config
+ configuration files.
+ * Correct editing of /etc/profile for LANG in locales-all script on
+ Progress Linux systems.
+
+ [ Richard Nelson ]
+ * Adding script for initial xfce4-panel configuration.
+
+ [ Daniel Baumann ]
+ * Only running xfce4-panel configuration if the default configuration
+ file hasn't been installed already by other means (e.g. includes).
+
+ [ Richard Nelson ]
+ * Adding entry for xfce4-panel in manpages.
+
+ [ Daniel Baumann ]
+ * Updating German manpage translation.
+
+ [ chals ]
+ * Updating French manpage translation.
+ * Updating Spanish manpage translation.
+
+ [ skizzhg ]
+ * Updating Italian translation.
+
+ [ Daniel Baumann ]
+ * Enabling systemd job on installation of live-config-systemd.
+ * Dropping pre-wheezy conflicts/replaces on live-config.
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 09 Feb 2013 07:41:29 +0100
+
+live-config (3.0.18-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding support for variables (ip and mac addresses) in hostname
+ script.
+
+ [ Ben Armstrong ]
+ * Fixing illegal redirect to named pipe with equivalent that works.
+
+ [ Daniel Baumann ]
+ * Removing bashism in exec call for logfile pipe, thanks to
+ Алексей Шилин <rootlexx@mail.ru>.
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 06 Jan 2013 20:17:48 +0100
+
+live-config (3.0.17-1) unstable; urgency=low
+
+ * Updating manpage year handling for 2013.
+ * Using fifo instead of pipe to catch logs from scripts (Closes:
+ #697320).
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 04 Jan 2013 09:57:16 +0100
+
+live-config (3.0.16-1) unstable; urgency=low
+
+ * Correcting spelling typo in manpage.
+ * Updating year in all copyright notices.
+ * Only set vboxvideo driver automatically in xserver-xorg script for
+ virtualbox systems if virtualbox-guest-x11 is installed, thanks to
+ Eugenio Paolantonio <me@medesimo.eu> (Closes: #697146).
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 02 Jan 2013 12:13:55 +0100
+
+live-config (3.0.15-1) unstable; urgency=low
+
+ * Adding support for virtualbox in xserver-xorg script.
+ * Updating boot parameter handling to work as advertised in the manpage
+ when specifing multiple and conflicting options.
+ * Adding console-tools to recommends.
+ * Correcting already-run checks to be after parameter handling in
+ hostname and hooks script.
+ * Disabling module-init-tools on wheezy and newer systems.
+ * Using automatic driver selection based on pci-ids in xserver-xorg
+ script only when lspci is available.
+ * Correcting spelling typo in bug script.
+ * Updating UTC handling for wheezy.
+ * Moving utc handling from tzdata to util-linux script where it original
+ belongs to.
+ * Adding missing entry for x-session-manager in variable list in live-
+ config manpage.
+ * Replacing some if conditionals with case for consistency.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 17 Dec 2012 21:22:00 +0100
+
+live-config (3.0.14-1) unstable; urgency=low
+
+ * Correcting wrong order of boot parameter parsing.
+ * Adding support for automatic fglrx driver selection in xserver-xorg
+ script.
+ * Updating comments in xserver-xorg script.
+ * Defering module loading for fglrx and nvidia to a later point in time
+ within xserver-xorg script to make it also work when being specified
+ through boot parameter.
+ * Removing superfluous comments about wheezy in xserver-xorg script.
+ * Passing all arguments to main function within live-config entry point.
+ * Renaming internal network function for consistency.
+ * Updating comment about processing command line.
+ * Correcting spelling typo in comment.
+ * Correcting typo in debug variable check.
+ * Adding local-options for dpkg-source in live-config-foobar example
+ package too.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 06 Dec 2012 20:02:25 +0100
+
+live-config (3.0.13-1) unstable; urgency=low
+
+ [ Ben Armstrong ]
+ * Fixing typo in examples/hooks/cat: test for q to quit, thanks to
+ Thanatermesis <thanatermesis@gmail.com>.
+
+ [ Daniel Baumann ]
+ * Allowing to overwrite xorg-driver based on pci-ids automatically via
+ pci-id files in /usr/share/live/config/xserver-xorg.
+ * Fixing roff formating typo in manpage.
+ * Updating manpage for xserver-xorg pci-id based overrides.
+ * Updating German manpage translation.
+ * Correcting unconditional precedence of pci-id based overrides over
+ automatic nvidia configuration in xserver-xorg script.
+
+ [ chals ]
+ * Updating Spanish translation of manpage.
+ * Updating French translation of manpage.
+
+ [ Daniel Baumann ]
+ * Allowing xorg.conf overrides in /usr/share/live/config/xserver-xorg
+ files.
+ * Removing note about apport script being ubuntu only in live-config
+ manpages.
+ * For completeness reasons, also mentioning dpkg-divert in live-config
+ manpage about removing scripts.
+ * Using consistent spelling to match parameter name for the noroot
+ variable.
+ * Assigning internal variables for shortcut options to be reused by
+ local scripts.
+
+ [ chals ]
+ * Updating the Spanish translation of man page.
+ * Updating the French translation of man page.
+
+ [ Daniel Baumann ]
+ * Adding updated Italian manpage translations from skizzhg
+ <skizzhg@gmx.com>.
+ * Updating systemd service file to make it actually work.
+ * Updating systemd service file installation location.
+ * Correcting spelling typo in comment on top-level Makefile on
+ uninstalling backends.
+ * Updating packaging for moved systemd service file location.
+ * Adding dpkg-source local options.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 30 Nov 2012 14:34:45 +0100
+
+live-config (3.0.12-1) unstable; urgency=low
+
+ * Allowing to overwrite distribution detection in live-config-update
+ with parameters.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 13 Nov 2012 14:53:00 +0100
+
+live-config (3.0.11-1) unstable; urgency=low
+
+ * Enforcing NoLogo option when using nvidia driver in xserver-xorg
+ script.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 09 Nov 2012 20:29:06 +0100
+
+live-config (3.0.10-1) unstable; urgency=low
+
+ * Correcting update-alternatives when handling nvidia automatically in
+ xserver-xorg script.
+ * Correcting nvidia module name for debian systems in xserver-xorg
+ script.
+ * Harmonizing po file headers.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 08 Nov 2012 11:00:49 +0100
+
+live-config (3.0.9-1) unstable; urgency=low
+
+ * Updating file paths for /lib/live/mount.
+ * Renaming /lib/live/mount/image to /lib/live/mount/medium.
+ * Updating package descriptions.
+ * Shortening default user fullname on progress.
+ * Updating name of the admin group in policykit script, thanks to
+ Андрій Шинкарчук <andriy.shynkarchuk@nuos.edu.ua>.
+ * Updating embedded live-config-foobar example packaging.
+ * Making sure that when enforcing nvidia driver, the respective
+ alternatives are set in xserver-xorg script.
+ * Making sure that when nvidia driver is installed but a non-nvidia
+ driver was enfored, the respective alternatives are set in xserver-
+ xorg-script.
+ * Switching to xz compression in live-config-foobar example packaging.
+ * If no driver was specified and one of the nvidia drivers is
+ installed, prefer the newest available nvidia driver over nouveau in
+ xserver-xorg script.
+ * Updating lsb_release calls for newer progress-linux.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 07 Nov 2012 14:45:22 +0100
+
+live-config (3.0.8-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.4.
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 30 Sep 2012 17:23:39 +0200
+
+live-config (3.0.7-1) unstable; urgency=low
+
+ * Moving remaining stuff from /live to /lib/live to avoid further
+ namespace pollution.
+ * Moving hooks and preseed inclusion to their final place within the
+ filesystems.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 27 Sep 2012 12:57:32 +0200
+
+live-config (3.0.6-1) unstable; urgency=low
+
+ * Synchronise gdm and gdm3 scripts.
+ * Remounting any persistence devices read-only on shutdown (Closes:
+ #688784).
+ * Flushing filesystem buffers on shutdown.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 26 Sep 2012 14:26:00 +0200
+
+live-config (3.0.5-1) unstable; urgency=low
+
+ * Skipping gdm script inclusion on newer debian and progress releases
+ than squeeze.
+ * Mounting /proc initally on progress with hidepid option.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 24 Sep 2012 09:58:10 +0200
+
+live-config (3.0.4-1) unstable; urgency=low
+
+ * Using /etc/live/config/* instead of /etc/live/config.d/*.conf and
+ /live/image/live/config/* instead of
+ /live/image/live/config.d/*.conf for consistency reasons.
+ * Removing leftover from live-debconfig in postrm.
+ * Recreating /etc/live/config in postinst.
+ * Removing /etc/live/config if empty on purge in postrm.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 24 Aug 2012 11:46:09 +0200
+
+live-config (3.0.3-1) unstable; urgency=low
+
+ * Correcting some spelling typos in script comments.
+ * Using consistent line breaks in alternative conditionals.
+ * Removing note about only supporting kde in kde-services script,
+ there's no older kde version supported anyway.
+ * Don't show flags in KDE (kxkbrc) too as we already do with GNOME by
+ default for better cultural correctness.
+ * Improving comment about shadow workaround in user-setup script.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 14 Aug 2012 12:55:07 +0200
+
+live-config (3.0.2-1) unstable; urgency=low
+
+ * Removing live-debconfig leftovers.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 14 Aug 2012 11:10:05 +0200
+
+live-config (3.0.1-1) unstable; urgency=low
+
+ * Correcting typo in keyboard-configuration recommends.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 10 Aug 2012 22:36:51 +0200
+
+live-config (3.0.0-1) unstable; urgency=low
+
+ * Adding updated Italian manpage translation from skizzhg
+ <skizzhg@gmx.com>.
+ * Shortening filename for xorg.conf.d file.
+ * Ensure that /etc/X11/xorg.conf.d exists before writing the
+ configuration file.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 03 Aug 2012 18:29:55 +0200
+
+live-config (3.0~b2-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Simplyfing find_iso eject check in boot initscript.
+ * Removing special hack for some arm boards in boot initscript.
+ * Moving initramfs-tools scripts content to live-tools.
+ * Harmonizing GPL boilerplate texts.
+ * Renumbering scripts to reflect initramfs-tools script removal.
+
+ [ chals ]
+ * Dealing with two easy-to-fix fuzzy strings in pt_BR on a best effort
+ basis.
+
+ [ Ben Armstrong ]
+ * Clarifying that keyboard variants and layouts are matched.
+ * Clarifying further that matching is one-to-one in order and blank
+ values allowed.
+
+ [ Daniel Baumann ]
+ * Updating keyboard variant description in manpages a bit further.
+ * Adding updated Brazilian Portuguese manpage translations from Tiago
+ Bortoletto Vaz <tiago@debian.org>.
+
+ [ chals ]
+ * Completing the French and Spanish translations of the man page.
+
+ [ Daniel Baumann ]
+ * Adding recommends to keyboard-configuration.
+ * Adding recommends to locales and locales-all.
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 29 Jul 2012 02:16:23 +0200
+
+live-config (3.0~b1-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Correcting wrong preseed fieldname in keyboard-configuration for
+ optionscode.
+ * Sorting keyboard-configuration handling alphabetically.
+ * Correcting wrong variable to make language assignments in locales
+ script actually work.
+ * Simplifying writing /etc/default/locale in locales script.
+ * Decrufting locales script to handle multiple locales.
+
+ [ Ben Armstrong ]
+ * Fixing two script name message typos.
+
+ [ Daniel Baumann ]
+ * Renaming live-config.keyboard-variant option to live-
+ config.keyboard-variants to indicate that multiple values can be
+ specified at the same time, thanks to Ben Armstrong
+ <synrg@debian.org>.
+
+ [ chals ]
+ * Fixing one 'fuzzy' in the Spanish translation of the man page.
+ * Fixing one 'fuzzy' in the French translation of the man page.
+
+ [ Daniel Baumann ]
+ * Correcting multi-locales assembling in locales script.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 24 Jul 2012 21:45:08 +0200
+
live-config (3.0~a43-1) unstable; urgency=low
* Adding /etc/os-release support to hostname debconf script.
diff -Naurp live-config.orig/debian/control live-config/debian/control
--- live-config.orig/debian/control 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/control 2013-02-15 10:34:10.452722877 +0100
@@ -5,7 +5,7 @@ Maintainer: Debian Live Project <debian-
Uploaders: Daniel Baumann <daniel@debian.org>
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: lsb-release
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://live.debian.net/devel/live-config/
Vcs-Browser: http://live.debian.net/gitweb/?p=live-config.git
Vcs-Git: git://live.debian.net/git/live-config.git
@@ -13,11 +13,13 @@ Vcs-Git: git://live.debian.net/git/live-
Package: live-config
Architecture: all
Depends: ${misc:Depends}, live-config-sysvinit | live-config-backend
-Recommends: live-config-doc, live-tools, user-setup, sudo
-Suggests: wget
-Description: Debian Live - System Configuration Scripts
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
+Recommends:
+ live-config-doc, live-tools, console-tools, iproute, keyboard-configuration,
+ locales | locales-all, user-setup, sudo
+Suggests: pciutils, wget
+Description: Live System Configuration Scripts
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
In addition to live-config, a backend for an init system is required, such as
live-config-sysvinit.
@@ -26,11 +28,9 @@ Package: live-config-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Conflicts: live-config (<< 3.0~a22~)
-Replaces: live-config
-Description: Debian Live - System Configuration Scripts (documentation)
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
+Description: Live System Configuration Scripts (documentation)
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
This package contains the documentation.
@@ -40,9 +40,9 @@ Depends: ${misc:Depends}, systemd
Conflicts: live-config-backend
Replaces: live-config-backend
Provides: live-config-backend
-Description: Debian Live - System Configuration Scripts (systemd backend)
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
+Description: Live System Configuration Scripts (systemd backend)
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
This package contains the systemd backend (experimental!).
@@ -52,9 +52,9 @@ Depends: ${misc:Depends}, sysvinit (>= 2
Conflicts: live-config-backend
Replaces: live-config-backend
Provides: live-config-backend
-Description: Debian Live - System Configuration Scripts (sysvinit backend)
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
+Description: Live System Configuration Scripts (sysvinit backend)
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
This package contains the sysvinit backend.
@@ -64,8 +64,8 @@ Depends: ${misc:Depends}, upstart
Conflicts: live-config-backend
Replaces: live-config-backend
Provides: live-config-backend
-Description: Debian Live - System Configuration Scripts (upstart backend)
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
+Description: Live System Configuration Scripts (upstart backend)
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
This package contains the upstart backend (experimental!).
diff -Naurp live-config.orig/debian/copyright live-config/debian/copyright
--- live-config.orig/debian/copyright 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/copyright 2013-02-15 09:38:24.080896588 +0100
@@ -4,7 +4,7 @@ Upstream-Contact: Debian Live Project <d
Source: http://live.debian.net/archive/packages/live-config/
Files: *
-Copyright: 2006-2012 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
License: GPL-3+
License: GPL-3+
diff -Naurp live-config.orig/debian/live-config.bug-presubj live-config/debian/live-config.bug-presubj
--- live-config.orig/debian/live-config.bug-presubj 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/live-config.bug-presubj 2013-02-15 09:38:24.080896588 +0100
@@ -1,9 +1,9 @@
Before submitting a bug report against live-config, please make sure
-that you have read our guidlines for Debian Live bug reports:
+that you have read our guidelines for Debian Live bug reports:
http://live.debian.net/manual/
-By providing the required information as outlined in the guidlines makes
+By providing the required information as outlined in the guidelines makes
sure that we can optimally reproduce and fix bugs, not doing so wastes a
lot of time for both the maintainers and the submitters.
diff -Naurp live-config.orig/debian/live-config.install live-config/debian/live-config.install
--- live-config.orig/debian/live-config.install 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/live-config.install 2013-02-15 09:38:24.080896588 +0100
@@ -1,3 +1,4 @@
sbin
-lib
+lib/live
+usr/share/live
var
diff -Naurp live-config.orig/debian/live-config.postinst live-config/debian/live-config.postinst
--- live-config.orig/debian/live-config.postinst 1970-01-01 01:00:00.000000000 +0100
+++ live-config/debian/live-config.postinst 2013-02-15 09:38:24.080896588 +0100
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ mkdir -p /etc/live/config
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Naurp live-config.orig/debian/live-config.postrm live-config/debian/live-config.postrm
--- live-config.orig/debian/live-config.postrm 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/live-config.postrm 2013-02-15 09:38:24.080896588 +0100
@@ -5,12 +5,13 @@ 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
rm -rf /var/lib/live/config
- rm -rf /var/lib/live/debconfig
rmdir --ignore-fail-on-non-empty /var/lib/live > /dev/null 2>&1 || true
;;
diff -Naurp live-config.orig/debian/live-config-systemd.install live-config/debian/live-config-systemd.install
--- live-config.orig/debian/live-config-systemd.install 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/live-config-systemd.install 2013-02-15 09:38:24.080896588 +0100
@@ -1 +1 @@
-etc/systemd
+lib/systemd
diff -Naurp live-config.orig/debian/live-config-systemd.postinst live-config/debian/live-config-systemd.postinst
--- live-config.orig/debian/live-config-systemd.postinst 1970-01-01 01:00:00.000000000 +0100
+++ live-config/debian/live-config-systemd.postinst 2013-02-15 09:38:24.080896588 +0100
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ if [ -x /bin/systemctl ]
+ then
+ systemctl enable --quiet live-config.service
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Naurp live-config.orig/debian/rules live-config/debian/rules
--- live-config.orig/debian/rules 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/rules 2013-02-15 09:38:24.080896588 +0100
@@ -20,7 +20,7 @@ override_dh_auto_install:
bin/live-config-update debian/tmp/lib/live/config
override_dh_builddeb:
- dh_builddeb -- -Zxz -z9
+ dh_builddeb -- -Zxz
override_dh_compress:
dh_compress -Xusr/share/doc/live-config/examples
diff -Naurp live-config.orig/debian/source/local-options live-config/debian/source/local-options
--- live-config.orig/debian/source/local-options 1970-01-01 01:00:00.000000000 +0100
+++ live-config/debian/source/local-options 2013-02-15 09:38:24.080896588 +0100
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff -Naurp live-config.orig/debian/source/options live-config/debian/source/options
--- live-config.orig/debian/source/options 2013-02-15 10:34:51.947043720 +0100
+++ live-config/debian/source/options 2013-02-15 09:38:24.080896588 +0100
@@ -1,2 +1 @@
compression = xz
-compression-level = 9
diff -Naurp live-config.orig/examples/hooks/cat live-config/examples/hooks/cat
--- live-config.orig/examples/hooks/cat 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/hooks/cat 2013-02-15 09:38:24.060897355 +0100
@@ -5,7 +5,7 @@ echo "live-config hook: cat"
_FILENAME=""
-while [ "${_FILENAME}" != c ]
+while [ "${_FILENAME}" != q ]
do
echo
echo -n "Enter filename [q for quit]: "
diff -Naurp live-config.orig/examples/live-config-foobar/configs/foobar.conf live-config/examples/live-config-foobar/configs/foobar.conf
--- live-config.orig/examples/live-config-foobar/configs/foobar.conf 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/configs/foobar.conf 2013-02-15 09:38:24.060897355 +0100
@@ -1,12 +1,12 @@
# /etc/live/config.conf.d/foobar.conf
## live-config-foobar(7) - Additional Configuration Scripts for Debian Live
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-## Copyright (C) 2012 John Doe <john@example.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2013 John Doe <john@example.org>
##
## live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
-LIVE_FOOBAR="foobar"
+EXAMPLE_FOOBAR="foobar"
diff -Naurp live-config.orig/examples/live-config-foobar/debian/changelog live-config/examples/live-config-foobar/debian/changelog
--- live-config.orig/examples/live-config-foobar/debian/changelog 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/debian/changelog 2013-02-15 10:34:10.452722877 +0100
@@ -3,4 +3,4 @@ live-config-foobar (3-1) unstable; urgen
* Initial release based on the live-config-foobar example package
included in live-config.
- -- John Doe <john@example.org> Sun, 26 Feb 2012 21:15:40 +0100
+ -- John Doe <john@example.org> Tue, 01 Jan 2013 00:17:13 +0100
diff -Naurp live-config.orig/examples/live-config-foobar/debian/control live-config/examples/live-config-foobar/debian/control
--- live-config.orig/examples/live-config-foobar/debian/control 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/debian/control 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
Source: live-config-foobar
Section: misc
-Priority: optional
+Priority: extra
Maintainer: John Doe <john@example.org>
Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.example.org/foobar/
Vcs-Browser: http://git.example.org/?p=live-config-foobar.git
Vcs-Git: git://git.example.org/git/live-config-foobar.git
@@ -11,8 +11,8 @@ Vcs-Git: git://git.example.org/git/live-
Package: live-config-foobar
Architecture: all
Depends: ${misc:Depends}, live-config (>= 3), live-config (<< 4)
-Description: Additional Configuration Scripts for Debian Live (foobar)
- live-config contains the scripts needed to perform late-userspace actions
- on Debian Live systems.
+Description: Additional Live System Configuration Scripts (foobar)
+ live-config contains the scripts that configure a live system during the boot
+ process (late userspace).
.
This package contains the additional foobar script(s).
diff -Naurp live-config.orig/examples/live-config-foobar/debian/copyright live-config/examples/live-config-foobar/debian/copyright
--- live-config.orig/examples/live-config-foobar/debian/copyright 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/debian/copyright 2013-02-15 09:38:24.060897355 +0100
@@ -8,8 +8,8 @@ Comment:
http://live.debian.net/devel/live-config/.
Files: *
-Copyright: 2006-2012 Daniel Baumann <daniel@debian.org>
- 2012 John Doe <john@example.org>
+Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
+ 2013 John Doe <john@example.org>
License: GPL-3+
License: GPL-3+
diff -Naurp live-config.orig/examples/live-config-foobar/debian/rules live-config/examples/live-config-foobar/debian/rules
--- live-config.orig/examples/live-config-foobar/debian/rules 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/debian/rules 2013-02-15 09:38:24.060897355 +0100
@@ -4,4 +4,4 @@
dh ${@}
override_dh_builddeb:
- dh_builddeb -- -Zgzip -z9
+ dh_builddeb -- -Zxz -z9
diff -Naurp live-config.orig/examples/live-config-foobar/debian/source/local-options live-config/examples/live-config-foobar/debian/source/local-options
--- live-config.orig/examples/live-config-foobar/debian/source/local-options 1970-01-01 01:00:00.000000000 +0100
+++ live-config/examples/live-config-foobar/debian/source/local-options 2013-02-15 09:38:24.060897355 +0100
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff -Naurp live-config.orig/examples/live-config-foobar/debian/source/options live-config/examples/live-config-foobar/debian/source/options
--- live-config.orig/examples/live-config-foobar/debian/source/options 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/debian/source/options 2013-02-15 09:38:24.060897355 +0100
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
diff -Naurp live-config.orig/examples/live-config-foobar/scripts/9000-foobar live-config/examples/live-config-foobar/scripts/9000-foobar
--- live-config.orig/examples/live-config-foobar/scripts/9000-foobar 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/live-config-foobar/scripts/9000-foobar 2013-02-15 09:38:24.060897355 +0100
@@ -1,8 +1,8 @@
#!/bin/sh
## live-config-foobar(7) - Additional Configuration Scripts for Debian Live
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-## Copyright (C) 2012 John Doe <john@example.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2013 John Doe <john@example.org>
##
## live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -21,7 +21,7 @@ Foobar ()
echo -n " foobar"
# Boot parameters can be acted up either this way...
- if ! echo ${_CMDLINE} | grep -qs "live-config.foobar" && \
+ if ! echo ${_CMDLINE} | grep -qs "example.foobar" && \
! echo ${_CMDLINE} | grep -qs "foobar"
then
return
@@ -31,8 +31,8 @@ Foobar ()
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
- live-config.foobar=*|foobar=*)
- LIVE_FOOBAR="${_PARAMETER#*foobar=}"
+ example.foobar=*|foobar=*)
+ EXAMPLE_FOOBAR="${_PARAMETER#*foobar=}"
;;
esac
done
@@ -42,8 +42,18 @@ Foobar ()
Configure_foobar ()
{
- # Configuring foobar
- sleep 1
+ # Configuring foobar either this way...
+ if [ -n "${EXAMPLE_FOOBAR}" ]
+ then
+ sleep 1
+ fi
+
+ # ...or if you want to specify certain options:
+ case "${EXAMPLE_FOOBAR}" in
+ foo)
+ sleep 1
+ ;;
+ esac
# Creating state file
touch /var/lib/live/config/foobar
diff -Naurp live-config.orig/examples/README live-config/examples/README
--- live-config.orig/examples/README 2013-02-15 10:34:51.947043720 +0100
+++ live-config/examples/README 2013-02-15 10:34:10.452722877 +0100
@@ -12,4 +12,4 @@ point. The following things should minim
* Replace any mentioning of 'foobar', 'Foobar' and 'FOOBAR' with the name of
your custom script or project name.
- -- Daniel Baumann <daniel@debian.org> Sun, 26 Feb 2012 21:15:40 +0100
+ -- Daniel Baumann <daniel@debian.org> Tue, 01 Jan 2013 00:16:32 +0100
diff -Naurp live-config.orig/Makefile live-config/Makefile
--- live-config.orig/Makefile 2013-02-15 10:34:51.943043882 +0100
+++ live-config/Makefile 2013-02-15 09:38:24.060897355 +0100
@@ -1,9 +1,9 @@
# Makefile
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -56,10 +56,8 @@ install:
mkdir -p $(DESTDIR)/etc/init
cp backends/upstart/live-config.upstart $(DESTDIR)/etc/init/live-config.conf
- mkdir -p $(DESTDIR)/etc/systemd/system
- cp backends/systemd/live-config.systemd $(DESTDIR)/etc/systemd/system/live-config.service
- mkdir -p $(DESTDIR)/etc/systemd/system/runlevel1.target.wants
- ln -s ../live-config.service $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
+ mkdir -p $(DESTDIR)/lib/systemd/system
+ cp backends/systemd/live-config.systemd $(DESTDIR)/lib/systemd/system/live-config.service
# Installing scripts
mkdir -p $(DESTDIR)/lib/live
@@ -70,6 +68,10 @@ install:
mkdir -p $(DESTDIR)/sbin
+ # Installing shared data
+ mkdir -p $(DESTDIR)/usr/share/live/config
+ cp -r VERSION share/* $(DESTDIR)/usr/share/live/config
+
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-config
cp -r COPYING examples $(DESTDIR)/usr/share/doc/live-config
@@ -91,7 +93,7 @@ install:
done
uninstall:
- # Uininstalling backends
+ # Uninstalling backends
rm -f $(DESTDIR)/etc/init.d/live
rm -f $(DESTDIR)/etc/init.d/live-config
rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init.d > /dev/null 2>&1 || true
@@ -101,11 +103,9 @@ uninstall:
rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc > /dev/null 2>&1 || true
- rm -f $(DESTDIR)/etc/systemd/system/live-config.service
- rm -f $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system/runlevel1.target.wants > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd > /dev/null 2>&1 || true
+ rm -f $(DESTDIR)/lib/systemd/system/live-config.service
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/systemd/system > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/systemd > /dev/null 2>&1 || true
# Uninstalling scripts
rm -f $(DESTDIR)/lib/live/boot-init.sh
@@ -119,6 +119,10 @@ uninstall:
rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR)/var > /dev/null 2>&1 || true
+ # Uninstalling shared data
+ rm -rf $(DESTDIR)/usr/share/live/config
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live
+
# Uninstalling docs
rm -rf $(DESTDIR)/usr/share/doc/live-config
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
diff -Naurp live-config.orig/manpages/bin/update-version.sh live-config/manpages/bin/update-version.sh
--- live-config.orig/manpages/bin/update-version.sh 2013-02-15 10:34:51.947043720 +0100
+++ live-config/manpages/bin/update-version.sh 2013-02-15 09:38:24.060897355 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -35,7 +35,9 @@ do
then
for _FILE in po/${_LANGUAGE}/*.po
do
- sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+ -e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+ "${_FILE}"
done
fi
done
@@ -45,6 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
then
for _FILE in po/pt_BR/*.po
do
- sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+ -e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+ "${_FILE}"
done
fi
diff -Naurp live-config.orig/manpages/en/live-config.7 live-config/manpages/en/live-config.7
--- live-config.orig/manpages/en/live-config.7 2013-02-15 10:34:51.947043720 +0100
+++ live-config/manpages/en/live-config.7 2013-02-15 10:34:10.452722877 +0100
@@ -1,12 +1,12 @@
.\" live-config(7) - System Configuration Scripts
-.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+.\" Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2012\-07\-12 3.0~a43-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2013\-02\-15 3.0.21-1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -37,11 +37,11 @@ Some individual scripts can change their
.IP "\fBlive\-config.debconf\-preseed\fR=filesystem|medium|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR | \fBdebconf\-preseed\fR=medium|filesystem|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows to fetch and apply one or more debconf preseed files to be applied to the debconf database. Note that the URLs must be fetchable by wget (http, ftp or file://).
.br
-If the file is placed on the live medium, it can be fetched with file:///live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
+If the file is placed on the live medium, it can be fetched with file:///lib/live/mount/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
-All preseed files in /lib/live/preseed/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
+All preseed files in /lib/live/config\-preseed/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
.br
-All preseed files in /live/preseed/ of the live medium can be automatically be enabled with the keyword 'medium'.
+All preseed files in /live/config\-preseed/ of the live medium can be automatically be enabled with the keyword 'medium'.
.br
If several mechanisms are combined, then filesystem preseed files are applied first, then medium preseed files, and last the network preseed files.
.IP "\fBlive\-config.hostname\fR=\fIHOSTNAME\fR | \fBhostname\fR=\fIHOSTNAME\fR" 4
@@ -56,32 +56,32 @@ Allows to set the fullname of the users
Allows to set the locale of the system, e.g. 'de_CH.UTF\-8'. The default is 'en_US.UTF\-8'. In case the selected locale is not already available on the system, it is automatically generated on the fly.
.IP "\fBlive\-config.timezone\fR=\fITIMEZONE\fR | \fBtimezone\fR=\fITIMEZONE\fR" 4
Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is 'UTC'.
-.IP "\fBlive\-config.utc\fR=\fByes\fR|no | \fButc\fR=\fByes\fR|no" 4
-Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
.IP "\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR | \fBkeyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
Allows to change the keyboard model. There is no default value set.
.IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR | \fBkeyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
Allows to change the keyboard layouts. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
-.IP "\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR | \fBkeyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
-Allows to change the keyboard variant. There is no default value set.
+.IP "\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR | \fBkeyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
+Allows to change the keyboard variants. If more than one is specified, the same number of values as keyboard\-layouts values should be specified as they will be matched one\-to\-one in the order specified. Blank values are allowed. The tools of the desktop environment will allow to switch between each layout and variant pair under X11. There is no default value set.
.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR | \fBkeyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
-Allows to change the keyboard options. There are no default value set.
+Allows to change the keyboard options. There is no default value set.
.IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR | \fBsysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
Allows to disable sysv services through update-rc.d.
+.IP "\fBlive\-config.utc\fR=\fByes\fR|no | \fButc\fR=\fByes\fR|no" 4
+Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
.IP "\fBlive\-config.x\-session\-manager=\fIX_SESSION_MANAGER\fR | \fBx\-session\-manager\fR=\fIX_SESSION_MANAGER\fR" 4
Allows to set the x\-session\-manager through update\-alternatives.
.IP "\fBlive\-config.xorg\-driver\fR=\fIXORG_DRIVER\fR | \fBxorg\-driver\fR=\fIXORG_DRIVER\fR" 4
-Allows to set xorg driver instead of autodetecting it.
+Allows to set xorg driver instead of autodetecting it. If a PCI ID is specified in /usr/share/live/config/xserver-xorg/\fIDRIVER\fR.ids within the live system, \fIDRIVER\fR is enforced for these devices. If both a boot parameter and a override is found, the boot parameter takes precedence.
.IP "\fBlive\-config.xorg\-resolution\fR=\fIXORG_RESOLUTION\fR | \fBxorg\-resolution\fR=\fIXORG_RESOLUTION\fR" 4
Allows to set xorg resolution instead of autodetecting it, e.g. 1024x768.
.IP "\fBlive\-config.hooks\fR=filesystem|medium|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR | \fBhooks\fR=medium|filesystem|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget (http, ftp or file://), the files are executed in /tmp of the running live system, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed. Some hooks for some common use-cases are available at /usr/share/doc/live-config/examples/hooks/ and <\fIhttp://live.debian.net/other/hooks\fR>.
.br
-If the file is placed on the live medium, it can be fetched with file:///live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
+If the file is placed on the live medium, it can be fetched with file:///lib/live/mount/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
-All hooks in /lib/live/hooks/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
+All hooks in /lib/live/config\-hooks/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
.br
-All hooks in /live/hooks/ of the live medium can be automatically be enabled with the keyword 'medium'.
+All hooks in /live/config\-hooks/ of the live medium can be automatically be enabled with the keyword 'medium'.
.br
If several mechanisms are combined, then filesystem hooks are executed first, then medium hooks, and last the network hooks.
@@ -106,7 +106,7 @@ Enables debug output in live\-config.
.SS Configuration Files
\fBlive\-config\fR can be configured (but not activated) through configuration files. Everything but the shortcuts that can be configured with a boot parameter can be alternatively also be configured through one or more files. If configuration files are used, the 'boot=live' parameter is still required to activate \fBlive\-config\fR.
.PP
-Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/config.conf, live/config.d/*.conf). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
+Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config/*), or on the live media (live/config.conf, live/config/*). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
.PP
Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it is suggested for consistency reasons to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
.PP
@@ -130,18 +130,20 @@ This variable equals the '\fBlive\-confi
This variable equals the '\fBlive\-config.locales\fR=\fILOCALE1\fR,\fILOCALE2\fR ... \fILOCALEn\fR' parameter.
.IP "\fBLIVE_TIMEZONE\fR=\fITIMEZONE\fR" 4
This variable equals the '\fBlive\-config.timezone\fR=\fITIMEZONE\fR' parameter.
-.IP "\fBLIVE_UTC\fR=\fByes\fR|no" 4
-This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
.IP "\fBLIVE_KEYBOARD_MODEL\fR=\fIKEYBOARD_MODEL\fR" 4
This variable equals the '\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR' parameter.
.IP "\fBLIVE_KEYBOARD_LAYOUTS\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
This variable equals the '\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR' parameter.
-.IP "\fBLIVE_KEYBOARD_VARIANT\fR=\fIKEYBOARD_VARIANT\fR" 4
-This variable equals the '\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR' parameter.
.IP "\fBLIVE_KEYBOARD_OPTIONS\fR=\fIKEYBOARD_OPTIONS\fR" 4
This variable equals the '\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR' parameter.
.IP "\fBLIVE_SYSV_RC\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
This variable equals the '\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR' parameter.
+.IP "\fBLIVE_UTC\fR=\fByes\fR|no" 4
+This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
+.IP "\fBLIVE_X_SESSION_MANAGER\fR=\fIX_SESSION_MANAGER\fR" 4
+This variable equals the '\fBlive\-config.x\-session\-manager\fR=\fIX_SESSION_MANAGER\fR' parameter.
.IP "\fBLIVE_XORG_DRIVER\fR=\fIXORG_DRIVER\fR" 4
This variable equals the '\fBlive\-config.xorg\-driver\fR=\fIXORG_DRIVER\fR' parameter.
.IP "\fBLIVE_XORG_RESOLUTION\fR=\fIXORG_RESOLUTION\fR" 4
@@ -158,7 +160,7 @@ Downstream projects can put their script
The scripts are best put into an own debian package. A sample package containing an example script can be found in /usr/share/doc/live\-config/examples.
.SS Removing existing config scripts
-It is not really possible to remove scripts itself in a sane way yet without requiring to ship a locally modified \fBlive\-config\fR package. However, the same can be achieved by disabling the respective scripts through the live\-noconfig mechanism, see above. To avoid to always need specifing disabled scripts through the boot parameter, a configuration file should be used, see above.
+It is not really possible to remove scripts itself in a sane way yet without requiring either to ship a locally modified \fBlive\-config\fR package or using dpkg-divert. However, the same can be achieved by disabling the respective scripts through the live\-noconfig mechanism, see above. To avoid to always need specifing disabled scripts through the boot parameter, a configuration file should be used, see above.
.PP
The configuration files for the live system itself are best put into an own debian package. A sample package containing an example configuration can be found in /usr/share/doc/live\-config/examples.
@@ -170,7 +172,7 @@ allows to apply arbitrary preseed files
.IP "\fBhostname\fR" 4
configures /etc/hostname and /etc/hosts.
.IP "\fBuser\-setup\fR" 4
-adds an live user account.
+adds a live user account.
.IP "\fBsudo\fR" 4
grants sudo privileges to the live user.
.IP "\fBlocales\fR" 4
@@ -203,7 +205,7 @@ configures sysvinit.
configures sysv-rc by disabling listed services.
.IP "\fBlogin\fR" 4
disables lastlog.
-.IP "\fBapport\fR (ubuntu only)" 4
+.IP "\fBapport\fR" 4
disables apport.
.IP "\fBgnome\-panel\-data\fR" 4
disables lock button for the screen.
@@ -211,8 +213,6 @@ disables lock button for the screen.
disables hibernation.
.IP "\fBgnome\-screensaver\fR" 4
disables the screensaver locking the screen.
-.IP "\fBinitramfs\-tools\fR" 4
-makes update\-initramfs to also update the live media when using persistency.
.IP "\fBkaboom\fR" 4
disables KDE migration wizard (squeeze and newer).
.IP "\fBkde\-services\fR" 4
@@ -234,28 +234,30 @@ disables util-linux' hwclock.
.IP "\fBlogin\fR" 4
disables lastlog.
.IP "\fBxserver\-xorg\fR" 4
-configures xserver-xorg.
+configures xserver\-xorg.
.IP "\fBureadahead\fR (ubuntu only)" 4
disables ureadahead.
.IP "\fBopenssh-server\fR" 4
recreates openssh-server host keys.
+.IP "\fBxfce4\-panel\fR" 4
+configures xfce4\-panel to default settings.
.IP "\fBhooks\fR" 4
allows to run arbitrary commands from a script placed on the live media or an http/ftp server.
.SH FILES
.IP "\fB/etc/live/config.conf\fR" 4
-.IP "\fB/etc/live/config.d/*.conf\fR" 4
+.IP "\fB/etc/live/config/*\fR" 4
.IP "\fBlive/config.conf\fR" 4
-.IP "\fBlive/config.d/*.conf\fR" 4
+.IP "\fBlive/config/*\fR" 4
.IP "\fB/lib/live/config.sh\fR" 4
.IP "\fB/lib/live/config/\fR" 4
.IP "\fB/var/lib/live/config/\fR" 4
.IP "\fB/var/log/live/config.log\fR" 4
.PP
-.IP "\fB/live/hooks/*\fR" 4
-.IP "\fBlive/hooks/*\fR" 4
-.IP "\fB/live/preseed/*\fR" 4
-.IP "\fBlive/preseed/* \fR" 4
+.IP "\fB/live/config\-hooks/*\fR" 4
+.IP "\fBlive/config\-hooks/*\fR" 4
+.IP "\fB/live/config\-preseed/*\fR" 4
+.IP "\fBlive/config\-preseed/* \fR" 4
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff -Naurp live-config.orig/manpages/Makefile live-config/manpages/Makefile
--- live-config.orig/manpages/Makefile 2013-02-15 10:34:51.947043720 +0100
+++ live-config/manpages/Makefile 2013-02-15 09:38:24.060897355 +0100
@@ -1,9 +1,9 @@
# Makefile
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0010-debconf live-config/scripts/config/0010-debconf
--- live-config.orig/scripts/config/0010-debconf 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0010-debconf 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -43,16 +43,16 @@ Configure_debconf ()
do
case "${_PRESEED}" in
filesystem)
- if ls /lib/live/preseed/* 2>&1
+ if ls /lib/live/config-preseed/* 2>&1
then
- _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/preseed/*; do echo file://${_FILE}; done)"
+ _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/config-preseed/*; do echo file://${_FILE}; done)"
fi
;;
medium)
- if ls /live/image/live/preseed/* 2>&1
+ if ls /lib/live/mount/medium/live/config-preseed/* 2>&1
then
- _PRESEEDS="${_PRESEEDS} $(for _FILE in /live/image/live/preseed/*; do echo file://${_FILE}; done)"
+ _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/mount/medium/live/config-preseed/*; do echo file://${_FILE}; done)"
fi
;;
@@ -72,7 +72,7 @@ Configure_debconf ()
cp $(echo ${_PRESEED} | sed 's|file://||') "${_TMPFILE}"
else
# remote file
- Start_network
+ Setup_network
wget --quiet "${_PRESEED}" -O "${_TMPFILE}"
fi
diff -Naurp live-config.orig/scripts/config/0020-hostname live-config/scripts/config/0020-hostname
--- live-config.orig/scripts/config/0020-hostname 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0020-hostname 2013-02-15 09:38:24.064897201 +0100
@@ -1,24 +1,15 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
Hostname ()
{
- # Checking if package is installed or already configured
- if [ -z "${LIVE_HOSTNAME}" ] || \
- [ -e /var/lib/live/config/hostname ]
- then
- return
- fi
-
- echo -n " hostname"
-
# Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
@@ -29,14 +20,34 @@ Hostname ()
esac
done
+ # Checking if package is installed or already configured
+ if [ -z "${LIVE_HOSTNAME}" ] || \
+ [ -e /var/lib/live/config/hostname ]
+ then
+ return
+ fi
+
+ echo -n " hostname"
+
Configure_hostname
}
Configure_hostname ()
{
# Change hostname only if it is not set
- if [ ! -e /etc/hostname ] || grep -qs localhost\.localdomain /etc/hostname
+ if [ ! -e /etc/hostname ] || \
+ grep -qs localhost\.localdomain /etc/hostname
then
+ # Supporting variables within hostnames
+ if [ -e /bin/ip ]
+ then
+ LINK="$(ip -oneline -family link address show dev eth0 | awk '{ print $13 }' | sed -e "s|:|${IP_SEPARATOR}|g")"
+ INET="$(ip -oneline -family inet address show dev eth0 | awk '{ print $4 }' | sed -e "s|\.|${IP_SEPARATOR}|g" -e 's|/.*||')"
+ INET6="$(ip -oneline -family inet6 address show dev eth0 | awk '{ print $4 }' | sed -e "s|:|${IP_SEPARATOR}|g" -e 's|/.*||' -e 's|--|-|')"
+
+ eval LIVE_HOSTNAME="${LIVE_HOSTNAME}"
+ fi
+
echo "${LIVE_HOSTNAME}" > /etc/hostname
else
LIVE_HOSTNAME="$(cat /etc/hostname)"
@@ -57,7 +68,7 @@ EOF
fi
- hostname "${LIVE_HOSTNAME}"
+ hostname "${LIVE_HOSTNAME}" || true
# Creating state file
touch /var/lib/live/config/hostname
diff -Naurp live-config.orig/scripts/config/0030-user-setup live-config/scripts/config/0030-user-setup
--- live-config.orig/scripts/config/0030-user-setup 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0030-user-setup 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -42,7 +42,7 @@ User_setup ()
Configure_user_setup ()
{
- # Checking if if package is already configured differently
+ # Checking if package is already configured differently
if grep -q "^${LIVE_USERNAME}:" /etc/passwd
then
return
@@ -55,10 +55,11 @@ Configure_user_setup ()
fi
# Make sure user is not in sudo group if sudo is disabled
- if [ "${_NO_ROOT}" = "true" ]
- then
- LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')"
- fi
+ case "${_NOROOT}" in
+ true)
+ LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')"
+ ;;
+ esac
# Default password is: live
# passwords can be generated with 'echo "live" | mkpasswd -s',
@@ -78,7 +79,7 @@ EOF
debconf-set-selections < /debconf.live
rm -f /debconf.live
- # FIXME
+ # Workaround for bug in shadow
set +e
touch /etc/passwd-
chmod 0600 /etc/passwd-
diff -Naurp live-config.orig/scripts/config/0040-sudo live-config/scripts/config/0040-sudo
--- live-config.orig/scripts/config/0040-sudo 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0040-sudo 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -34,7 +34,7 @@ Sudo ()
Configure_sudo ()
{
- # Checking if if package is already configured differently
+ # Checking if package is already configured differently
if grep -qs "^${LIVE_USERNAME}" /etc/sudoers.d/live
then
return
diff -Naurp live-config.orig/scripts/config/0050-locales live-config/scripts/config/0050-locales
--- live-config.orig/scripts/config/0050-locales 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0050-locales 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -34,76 +34,27 @@ Locales ()
Configure_locales ()
{
- if [ -e /etc/default/locale ]
+ if echo "${LIVE_LOCALES}" | grep -qs ","
then
- # use rootfs configured locale
- _LOCALE="$(grep -s 'LANG=' /etc/default/locale | sed s/'LANG='// | tr -d '"' )"
+ # multiple locales specified
+ _LOCALE="$(echo ${LIVE_LOCALES} | sed -e 's|,.*||')"
+ _LOCALES="$(echo ${LIVE_LOCALES} | sed -e "s|^${_LOCALE},||" -e 's|,| |g')"
+ else
+ # one or no locale specified
+ _LOCALE="${LIVE_LOCALES:-en_US.UTF-8}"
+ _LOCALES=""
fi
- if [ -n "${LIVE_LOCALES}" ]
- then
- _LOCALE="${LIVE_LOCALES}"
- _SET_LOCALE="true"
- fi
-
- if [ -z "${_LOCALE}" ]
- then
- # Set a default one
- _LOCALE="en_US.UTF-8"
- _SET_LOCALE="true"
- fi
-
- _LANGUAGE="$(echo $locale | cut -d. -f1)"
- export _LANGUAGE
-
- if [ -z "${_SET_LOCALE}" ]
- then
- # Actually, we should check here if the locale is generated
- return
- fi
-
- if echo "${_LOCALE}" | grep -sqE '^[[:lower:]]{2}$'
- then
- # input is like "locale=ch", so we will convert and setup also the keyboard if not already set
- if [ -z "${_KEYBOARD}" ]
- then
- _KEYBOARD="${_LOCALE}"
- export _KEYBOARD
- fi
-
- _LOCALE_UP=$(echo "${_LOCALE}" | tr '[a-z]' '[A-Z]')
- _LOCALE="${_LOCALE}_${_LOCALE_UP}.UTF-8"
- fi
-
- LANG=
- _LANGUAGE="$(echo ${_LOCALE} | cut -d. -f1)"
- eval $(awk '/^'"${_LOCALE}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /usr/share/i18n/SUPPORTED)
-
- if [ -z "${LANG}" ]
- then
- # Try and fallback to another codepage for this language.
- eval $(awk '/^'"${_LANGUAGE}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /usr/share/i18n/SUPPORTED)
-
- if [ -n "${LANG}" ]
- then
- echo "Choosing locale '${LANG}' as '${_LOCALE}' is unsupported."
- fi
- fi
-
- if [ -z "${LANG}" ]
- then
- echo "Locale '${_LOCALE}' is unsupported."
- _CODEPAGE="UTF-8"
- _LANGUAGE="en_US"
- _LOCALE="${_LANGUAGE}.${_CODEPAGE}"
- LANG="${_LANGUAGE}.${_CODEPAGE}"
- fi
-
- printf 'LANG="%s"\n' "${LANG}" > /etc/default/locale
+ echo "LANG=${_LOCALE}" > /etc/default/locale
if [ -e /etc/locale.gen ]
then
- sed -i -e "s|# ${LANG} ${_CODEPAGE}|${LANG} ${_CODEPAGE}|" /etc/locale.gen
+ for _LOCALE in ${_LOCALE} ${_LOCALES}
+ do
+ _CHARSET="$(echo ${_LOCALE} | awk -F. '{ print $2 }')"
+
+ sed -i -e "s|# ${_LOCALE} ${_CHARSET}|${_LOCALE} ${_CHARSET}|" /etc/locale.gen
+ done
fi
locale-gen --keep-existing > /dev/null 2>&1
diff -Naurp live-config.orig/scripts/config/0060-locales-all live-config/scripts/config/0060-locales-all
--- live-config.orig/scripts/config/0060-locales-all 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0060-locales-all 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -34,9 +34,19 @@ Locales_all ()
Configure_locales_all ()
{
- _LOCALE="${LIVE_LOCALES:-en_US.UTF-8}"
+ if [ -n "${LIVE_LOCALES}" ]
+ then
+ LIVE_LOCALES="$(echo ${LIVE_LOCALES} | awk -F, '{ print $1 }')"
+ else
+ LIVE_LOCALES="en_US.UTF-8"
+ fi
- printf 'export LANG="%s"\n' "${_LOCALE}" > /etc/profile.d/locales-all.sh
+ if [ -e /etc/progress-linux_version ]
+ then
+ sed -i -e "s|^ *export LANG=.*|export LANG=\"${LIVE_LOCALES}\"|" /etc/profile
+ else
+ printf 'export LANG="%s"\n' "${_LOCALE}" > /etc/profile.d/zz-live-config_locales-all.sh
+ fi
# Creating state file
touch /var/lib/live/config/locales-all
diff -Naurp live-config.orig/scripts/config/0070-tzdata live-config/scripts/config/0070-tzdata
--- live-config.orig/scripts/config/0070-tzdata 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0070-tzdata 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -26,10 +26,6 @@ Tzdata ()
live-config.timezone=*|timezone=*)
LIVE_TIMEZONE="${_PARAMETER#*timezone=}"
;;
-
- live-config.utc=*|utc=*)
- LIVE_UTC="${_PARAMETER#*utc=}"
- ;;
esac
done
@@ -54,11 +50,6 @@ EOF
cp -f /usr/share/zoneinfo/${_AREA}/${_ZONE} /etc/localtime
- if [ -n "${LIVE_UTC}" ]
- then
- sed -i -e "s|UTC=.*|UTC=${LIVE_UTC}|" /etc/default/rcS
- fi
-
# Creating state file
touch /var/lib/live/config/tzdata
}
diff -Naurp live-config.orig/scripts/config/0080-gdm live-config/scripts/config/0080-gdm
--- live-config.orig/scripts/config/0080-gdm 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0080-gdm 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -42,8 +42,8 @@ Gdm ()
Configure_gdm ()
{
- # Checking if if package is already configured differently
- if grep -qs AutomaticLoginEnable /etc/gdm/gdm.conf
+ # Checking if package is already configured differently
+ if grep -qs AutomaticLoginEnable=true /etc/gdm/gdm.conf
then
return
fi
diff -Naurp live-config.orig/scripts/config/0090-gdm3 live-config/scripts/config/0090-gdm3
--- live-config.orig/scripts/config/0090-gdm3 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0090-gdm3 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -42,7 +42,7 @@ Gdm3 ()
Configure_gdm3 ()
{
- # Checking if if package is already configured
+ # Checking if package is already configured
if grep -qs AutomaticLoginEnable=true /etc/gdm3/daemon.conf
then
return
diff -Naurp live-config.orig/scripts/config/0100-kdm live-config/scripts/config/0100-kdm
--- live-config.orig/scripts/config/0100-kdm 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0100-kdm 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0110-lightdm live-config/scripts/config/0110-lightdm
--- live-config.orig/scripts/config/0110-lightdm 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0110-lightdm 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -45,7 +45,7 @@ Configure_lightdm ()
if [ -e /etc/lightdm/lightdm.conf ]
then
sed -i -r -e "s|^#.*autologin-user=.*\$|autologin-user=${LIVE_USERNAME}|" \
- -e "s|^#.*autologin-user-timeout=.*\$|autologin-user-timeout=5|" \
+ -e "s|^#.*autologin-user-timeout=.*\$|autologin-user-timeout=0|" \
/etc/lightdm/lightdm.conf
fi
diff -Naurp live-config.orig/scripts/config/0120-lxdm live-config/scripts/config/0120-lxdm
--- live-config.orig/scripts/config/0120-lxdm 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0120-lxdm 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0130-nodm live-config/scripts/config/0130-nodm
--- live-config.orig/scripts/config/0130-nodm 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0130-nodm 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0140-slim live-config/scripts/config/0140-slim
--- live-config.orig/scripts/config/0140-slim 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0140-slim 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -42,7 +42,7 @@ Slim ()
Configure_slim ()
{
- # Checking if if package is already configured differently
+ # Checking if package is already configured differently
if grep -qs "^auto_login" /etc/slim.conf
then
return
diff -Naurp live-config.orig/scripts/config/0150-xinit live-config/scripts/config/0150-xinit
--- live-config.orig/scripts/config/0150-xinit 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0150-xinit 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -11,12 +11,13 @@
Xinit ()
{
# Checking if a display manager has been configured
- if [ "${_X11}" = "true" ]
- then
- rm -f /etc/profile.d/zz-live.sh
-
- return
- fi
+ case "${_X11}" in
+ true)
+ rm -f /etc/profile.d/zz-live-config_xinit.sh
+
+ return
+ ;;
+ esac
# Checking if package is installed or already configured
if [ ! -e /var/lib/dpkg/info/xinit.list ] || \
@@ -32,13 +33,13 @@ Xinit ()
Configure_xinit ()
{
- # Checking if if package is already configured differently
- if [ -e /etc/profile.d/zz-live.sh ]
+ # Checking if package is already configured differently
+ 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
diff -Naurp live-config.orig/scripts/config/0160-keyboard-configuration live-config/scripts/config/0160-keyboard-configuration
--- live-config.orig/scripts/config/0160-keyboard-configuration 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0160-keyboard-configuration 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -35,8 +35,8 @@ Keyboard_configuration ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
;;
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ live-config.keyboard-variants=*|keyboard-variants=*)
+ LIVE_KEYBOARD_VARIANTS="${_PARAMETER#*keyboard-variants=}"
;;
esac
done
@@ -46,13 +46,6 @@ Keyboard_configuration ()
Configure_keyboard_configuration ()
{
- if [ -n "${LIVE_KEYBOARD_MODEL}" ]
- then
- echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
-
- sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
- fi
-
if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
then
echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
@@ -60,20 +53,27 @@ Configure_keyboard_configuration ()
sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUTS}\"|" /etc/default/keyboard
fi
- if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
then
- echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+ echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
- sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+ sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
fi
if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
then
- echo "keyboard-configuration keyboard-configuration/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+ echo "keyboard-configuration keyboard-configuration/optionscode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
fi
+ if [ -n "${LIVE_KEYBOARD_VARIANTS}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANTS}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANTS}\"|" /etc/default/keyboard
+ fi
+
if [ -e /tmp/debconf.live ]
then
debconf-set-selections < /tmp/debconf.live
diff -Naurp live-config.orig/scripts/config/0170-sysvinit live-config/scripts/config/0170-sysvinit
--- live-config.orig/scripts/config/0170-sysvinit 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0170-sysvinit 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0180-sysv-rc live-config/scripts/config/0180-sysv-rc
--- live-config.orig/scripts/config/0180-sysv-rc 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0180-sysv-rc 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/0190-upstart live-config/scripts/config/0190-upstart
--- live-config.orig/scripts/config/0190-upstart 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/0190-upstart 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -38,7 +38,8 @@ Configure_upstart ()
do
_TTY="$(basename ${_FILE} .conf)"
- if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
+ if [ -e /sbin/mingetty ] || \
+ grep -qs '^exec.*mingetty' "${_FILE}"
then
# mingetty has autologin support
sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"
diff -Naurp live-config.orig/scripts/config/1010-apport live-config/scripts/config/1010-apport
--- live-config.orig/scripts/config/1010-apport 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1010-apport 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1020-gnome-panel-data live-config/scripts/config/1020-gnome-panel-data
--- live-config.orig/scripts/config/1020-gnome-panel-data 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1020-gnome-panel-data 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1030-gnome-power-manager live-config/scripts/config/1030-gnome-power-manager
--- live-config.orig/scripts/config/1030-gnome-power-manager 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1030-gnome-power-manager 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -17,7 +17,7 @@ Gnome_power_manager ()
return
fi
- echo -n " gnome-screensaver"
+ echo -n " gnome-power-manager"
# Reading kernel command line
for _PARAMETER in ${_CMDLINE}
diff -Naurp live-config.orig/scripts/config/1040-gnome-screensaver live-config/scripts/config/1040-gnome-screensaver
--- live-config.orig/scripts/config/1040-gnome-screensaver 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1040-gnome-screensaver 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -17,7 +17,7 @@ Gnome_screensaver ()
return
fi
- echo -n " gnome-screesnaver"
+ echo -n " gnome-screensaver"
# Reading kernel command line
for _PARAMETER in ${_CMDLINE}
diff -Naurp live-config.orig/scripts/config/1050-initramfs-tools live-config/scripts/config/1050-initramfs-tools
--- live-config.orig/scripts/config/1050-initramfs-tools 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1050-initramfs-tools 1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-Initramfs_tools ()
-{
- # Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/initramfs-tools.list ] || \
- [ -e /var/lib/live/config/initramfs-tools ]
- then
- return
- fi
-
- echo -n " initramfs-tools"
-
- Configure_update_initramfs
-}
-
-Configure_update_initramfs ()
-{
- # Checking if apckage is already configured differently
- if [ -e /usr/sbin/update-initramfs.debian ]
- then
- return
- fi
-
- # Possibly disabling update-initramfs (useless on a live CD)
-
- # Diverting /usr/sbin/update-initramfs
- dpkg-divert --quiet --package live-config --add --rename --divert /usr/sbin/update-initramfs.debian /usr/sbin/update-initramfs
-
- # rw is guaranteed to be first.
- if [ -w /cdrom ] && grep -q ' /cdrom rw[, ]' /proc/self/mountinfo
- then
- # live-media is writable
-
-cat > /usr/sbin/update-initramfs << 'EOF'
-#!/bin/sh
-
-# Updating initramfs
-update-initramfs.debian "${@}"
-
-if [ -e /initrd.img ]
-then
- _DIRECTORY=""
-else
- _DIRECTORY="/boot"
-fi
-
-# Copying kernel and initrd to live media
-if [ -e /cdrom/live/initrd.lz ]
-then
- zcat "${_DIRECTORY}/initrd.img" | lzma -9c > /cdrom/live/initrd.lz.new
- mv /cdrom/live/initrd.lz.new /cdrom/live/initrd.lz
-else
- cp "${_DIRECTORY}/initrd.img" /cdrom/live/initrd.gz.new
- mv /cdrom/live/initrd.gz.new /cdrom/live/initrd.gz
-fi
-
-cp "${_DIRECTORY}/vmlinuz" /cdrom/live/vmlinuz.new
-mv /cdrom/live/vmlinuz.new /cdrom/live/vmlinuz
-EOF
-
- else
- # live-media is read-only
-
-cat > /usr/sbin/update-initramfs << EOF
-#!/bin/sh
-
-echo "I: update-initramfs is disabled (live system is running on read-only media)."
-EOF
-
-fi
-
- chmod 0755 /usr/sbin/update-initramfs
-
- # Creating state file
- touch /var/lib/live/config/initramfs-tools
-}
-
-Initramfs_tools
diff -Naurp live-config.orig/scripts/config/1050-kaboom live-config/scripts/config/1050-kaboom
--- live-config.orig/scripts/config/1050-kaboom 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1050-kaboom 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1060-kde-services live-config/scripts/config/1060-kde-services
--- live-config.orig/scripts/config/1060-kde-services 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1060-kde-services 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -11,7 +11,6 @@
Kde_services ()
{
# Checking if package is installed or already configured
- # we're only checking for KDE4 here (FIXME).
if [ ! -e /usr/share/kde4 ] || \
[ -e /var/lib/live/config/kde-services ]
then
@@ -51,7 +50,7 @@ cat > "/home/${LIVE_USERNAME}/.kde/share
DisplayNames=${LIVE_KEYBOARD_LAYOUTS}
IndicatorOnly=false
LayoutList=${LIVE_KEYBOARD_LAYOUTS}
-ShowFlag=true
+ShowFlag=false
SwitchMode=Global
Use=true
EOF
diff -Naurp live-config.orig/scripts/config/1070-debian-installer-launcher live-config/scripts/config/1070-debian-installer-launcher
--- live-config.orig/scripts/config/1070-debian-installer-launcher 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1070-debian-installer-launcher 2013-02-15 09:38:24.064897201 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1080-module-init-tools live-config/scripts/config/1080-module-init-tools
--- live-config.orig/scripts/config/1080-module-init-tools 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1080-module-init-tools 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1090-policykit live-config/scripts/config/1090-policykit
--- live-config.orig/scripts/config/1090-policykit 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1090-policykit 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -66,7 +66,7 @@ EOF
fi
cat >> /etc/PolicyKit/PolicyKit.conf << EOF
- <define_admin_auth group="admin"/>
+ <define_admin_auth group="adm"/>
</config>
EOF
diff -Naurp live-config.orig/scripts/config/1100-sslcert live-config/scripts/config/1100-sslcert
--- live-config.orig/scripts/config/1100-sslcert 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1100-sslcert 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1110-update-notifier live-config/scripts/config/1110-update-notifier
--- live-config.orig/scripts/config/1110-update-notifier 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1110-update-notifier 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1120-anacron live-config/scripts/config/1120-anacron
--- live-config.orig/scripts/config/1120-anacron 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1120-anacron 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1130-util-linux live-config/scripts/config/1130-util-linux
--- live-config.orig/scripts/config/1130-util-linux 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1130-util-linux 2013-02-15 10:34:10.452722877 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -19,6 +19,16 @@ Util_linux ()
echo -n " util-linux"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.utc=*|utc=*)
+ LIVE_UTC="${_PARAMETER#*utc=}"
+ ;;
+ esac
+ done
+
Configure_util_linux
}
@@ -26,6 +36,37 @@ Configure_util_linux ()
{
rm -f /etc/rc?.d/*hwclock*
+ if [ -n "${LIVE_UTC}" ]
+ then
+ if [ -e /run ]
+ then
+ # wheezy
+ case "${LIVE_UTC}" in
+ yes)
+
+cat > /etc/adjtime << EOF
+0.0 0 0.0
+0
+UTC
+EOF
+
+ ;;
+
+ no)
+
+cat > /etc/adjtime << EOF
+0.0 0 0.0
+0
+EOF
+
+ ;;
+ esac
+ else
+ # squeeze
+ sed -i -e "s|UTC=.*|UTC=${LIVE_UTC}|" /etc/default/rcS
+ fi
+ fi
+
# Creating state file
touch /var/lib/live/config/util-linux
}
diff -Naurp live-config.orig/scripts/config/1140-login live-config/scripts/config/1140-login
--- live-config.orig/scripts/config/1140-login 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1140-login 2013-02-15 10:34:10.456722715 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1150-xserver-xorg live-config/scripts/config/1150-xserver-xorg
--- live-config.orig/scripts/config/1150-xserver-xorg 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1150-xserver-xorg 2013-02-15 10:34:10.456722715 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -34,8 +34,8 @@ Xserver_xorg ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
;;
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ live-config.keyboard-variants=*|keyboard-variants=*)
+ LIVE_KEYBOARD_VARIANTS="${_PARAMETER#*keyboard-variants=}"
;;
live-config.xorg-xsession-manager=*|x-session-manager=*)
@@ -67,9 +67,9 @@ Configure_xserver_xorg ()
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
fi
- if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ if [ -n "${LIVE_KEYBOARD_VARIANTS}" ]
then
- echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANTS}" >> /tmp/debconf.live
fi
if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
@@ -90,16 +90,125 @@ Configure_xserver_xorg ()
esac
fi
+ if [ -z "${LIVE_XORG_DRIVER}" ] && [ -e /usr/bin/lspci ]
+ then
+ # pci-id of the first graphic card
+ _DEVICE="$(lspci -mn | awk '/0300/ { print $3$4 }' | sed -e 's|"||g' | tr [a-z] [A-Z] | head -n1)"
+
+ if [ -n "${_DEVICE}" ]
+ then
+ if ls /usr/share/live/config/xserver-xorg/*.ids > /dev/null 2>&1
+ then
+ # xorg-driver manual overrides
+ for _OVERRIDE_IDS in /usr/share/live/config/xserver-xorg/*.ids
+ do
+ if [ -e "${_OVERRIDE_IDS}" ]
+ then
+ if grep -qs "${_DEVICE}" "${_OVERRIDE_IDS}"
+ then
+ LIVE_XORG_DRIVER="$(basename ${_OVERRIDE_IDS} .ids)"
+
+ break
+ fi
+ fi
+ done
+ fi
+
+ if [ -z "${LIVE_XORG_DRIVER}" ]
+ then
+ # xorg-driver automatic override for virtualbox
+ if [ -e /var/lib/dpkg/info/virtualbox-guest-x11.list ] && echo "${_DEVICE}" | grep -qs '^80EEBEEF'
+ then
+ LIVE_XORG_DRIVER="vboxvideo"
+ fi
+
+ # xorg-driver automatic override for fglrx
+ if echo "${_DEVICE}" | grep -qs '^1002'
+ then
+ if grep -qs "${_DEVICE}" /usr/share/fglrx/fglrx.ids
+ then
+ LIVE_XORG_DRIVER="fglrx"
+ fi
+ fi
+
+ # xorg-driver automatic override for nvidia
+ if echo "${_DEVICE}" | grep -qs -E '^(10DE|12D2)'
+ then
+ for _NVIDIA_IDS in /usr/lib/nvidia/current/nvidia.ids $(ls /usr/lib/nvidia/legacy-*/nvidia.ids | sort -V -r)
+ do
+ if [ -e "${_NVIDIA_IDS}" ]
+ then
+ if grep -qs "${_DEVICE}" ${_NVIDIA_IDS}
+ then
+ _NVIDIA_VERSION="$(basename $(dirname ${_NVIDIA_IDS}))"
+ _NVIDIA_MODULE="$(echo nvidia-${_NVIDIA_VERSION} | sed -e 's|-current$||')"
+
+ break
+ fi
+ fi
+ done
+
+ if [ -n "${_NVIDIA_VERSION}" ]
+ then
+ LIVE_XORG_DRIVER="nvidia"
+ fi
+ fi
+ fi
+ fi
+ fi
+
if [ -n "${LIVE_XORG_DRIVER}" ]
then
+ mkdir -p /etc/X11/xorg.conf.d
-cat > /etc/X11/xorg.conf.d/99-live_driver.conf << EOF
+ 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/zz-live-config_xserver-xorg.conf
+ else
+
+ # xorg-driver automatic override
+
+cat > /etc/X11/xorg.conf.d/zz-live-config_xserver-xorg.conf << EOF
Section "Device"
Identifier "Default screen"
Driver "${LIVE_XORG_DRIVER}"
EndSection
EOF
+ fi
+
+ case "${LIVE_XORG_DRIVER}" in
+ fglrx)
+ if [ -e /etc/alternatives/glx ]
+ then
+ update-alternatives --quiet --set glx /usr/lib/fglrx
+ fi
+
+ modprobe fglrx
+ ;;
+
+ nvidia)
+ if [ -e /etc/alternatives/glx ]
+ then
+ update-alternatives --quiet --set glx /usr/lib/nvidia
+ fi
+
+ if [ -e /etc/alternatives/nvidia ]
+ then
+ update-alternatives --quiet --set nvidia /usr/lib/nvidia/${_NVIDIA_VERSION:-current}
+ fi
+
+ modprobe --ignore-install ${_NVIDIA_MODULE:-nvidia}
+ ;;
+
+ *)
+ if [ -e /etc/alternatives/glx ]
+ then
+ update-alternatives --quiet --set glx /usr/lib/mesa-diverted
+ fi
+ ;;
+ esac
fi
if [ -n "${LIVE_XORG_RESOLUTION}" ]
diff -Naurp live-config.orig/scripts/config/1160-ureadahead live-config/scripts/config/1160-ureadahead
--- live-config.orig/scripts/config/1160-ureadahead 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1160-ureadahead 2013-02-15 10:34:10.456722715 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Naurp live-config.orig/scripts/config/1170-openssh-server live-config/scripts/config/1170-openssh-server
--- live-config.orig/scripts/config/1170-openssh-server 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config/1170-openssh-server 2013-02-15 10:34:10.456722715 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -35,11 +35,12 @@ Configure_openssh_server ()
fi
done
- if [ "${_SSH}" = "true" ]
- then
- # Creating state file
- touch /var/lib/live/config/openssh-server
- fi
+ case "${_SSH}" in
+ true)
+ # Creating state file
+ touch /var/lib/live/config/openssh-server
+ ;;
+ esac
}
Openssh_server
diff -Naurp live-config.orig/scripts/config/1170-xfce4-panel live-config/scripts/config/1170-xfce4-panel
--- live-config.orig/scripts/config/1170-xfce4-panel 1970-01-01 01:00:00.000000000 +0100
+++ live-config/scripts/config/1170-xfce4-panel 2013-02-15 09:38:24.064897201 +0100
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+Xfce4_panel ()
+{
+ # Checking if package is installed or already configured
+ if [ ! -e /var/lib/dpkg/info/xfce4-panel.list ] || \
+ [ -e /var/lib/live/config/xfce4-panel ]
+ then
+ return
+ fi
+
+ echo -n " xfce4-panel"
+
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
+ Configure_xfce4_panel
+}
+
+Configure_xfce4_panel ()
+{
+ if [ ! -e /home/"${LIVE_USERNAME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml ]
+ then
+ sudo -u "${LIVE_USERNAME}" mkdir -p /home/"${LIVE_USERNAME}"/.config/xfce4/xfconf/xfce-perchannel-xml
+ sudo -u "${LIVE_USERNAME}" cp /etc/xdg/xfce4/panel/default.xml /home/"${LIVE_USERNAME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+ fi
+
+ # Creating state file
+ touch /var/lib/live/config/xfce4-panel
+}
+
+Xfce4_panel
diff -Naurp live-config.orig/scripts/config/9990-hooks live-config/scripts/config/9990-hooks
--- live-config.orig/scripts/config/9990-hooks 2013-02-15 10:34:51.955043397 +0100
+++ live-config/scripts/config/9990-hooks 2013-02-15 09:38:24.064897201 +0100
@@ -1,22 +1,16 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
Hooks ()
{
- if [ -z "${LIVE_HOOKS}" ]
- then
- return
- fi
-
- echo -n " hooks"
-
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
@@ -26,6 +20,13 @@ Hooks ()
esac
done
+ if [ -z "${LIVE_HOOKS}" ]
+ then
+ return
+ fi
+
+ echo -n " hooks"
+
Process_hooks
}
@@ -40,16 +41,16 @@ Process_hooks ()
do
case "${_HOOK}" in
filesystem)
- if ls /lib/live/hooks/* 2>&1
+ if ls /lib/live/config-hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(for _FILE in /lib/live/hooks/*; do echo file://${_FILE}; done)"
+ _HOOKS="${_HOOKS} $(for _FILE in /lib/live/config-hooks/*; do echo file://${_FILE}; done)"
fi
;;
medium)
- if ls /live/image/live/hooks/* 2>&1
+ if ls /lib/live/mount/medium/live/config-hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(for _FILE in /live/image/live/hooks/*; do echo file://${_FILE}; done)"
+ _HOOKS="${_HOOKS} $(for _FILE in /lib/live/mount/medium/live/config-hooks/*; do echo file://${_FILE}; done)"
fi
;;
@@ -69,7 +70,7 @@ Process_hooks ()
cp $(echo ${_HOOK} | sed 's|file://||') "${_TMPFILE}"
else
# remote file
- Start_network
+ Setup_network
wget --quiet "${_HOOK}" -O "${_TMPFILE}"
fi
diff -Naurp live-config.orig/scripts/config.sh live-config/scripts/config.sh
--- live-config.orig/scripts/config.sh 2013-02-15 10:34:51.951043558 +0100
+++ live-config/scripts/config.sh 2013-02-15 09:38:24.064897201 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -32,58 +32,61 @@ DEBIAN_FRONTEND="noninteractive"
DEBIAN_PRIORITY="critical"
DEBCONF_NOWARNINGS="yes"
+IP_SEPARATOR="-"
+PROC_OPTIONS="onodev,noexec,nosuid"
+
Cmdline ()
{
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
- live-config|config)
- # Run all scripts
- _SCRIPTS="$(ls /lib/live/config/*)"
- ;;
-
live-config=*|config=*)
# Only run requested scripts
LIVE_CONFIGS="${_PARAMETER#*config=}"
+ LIVE_NOCONFIGSS=""
+ _SCRIPTS=""
;;
- live-noconfig|noconfig)
- # Don't run any script
- _SCRIPTS=""
+ live-config|config)
+ # Run all scripts
+ LIVE_CONFIGS=""
+ LIVE_NOCONFIGS=""
+ _SCRIPTS="$(ls /lib/live/config/*)"
;;
live-noconfig=*|noconfig=*)
# Don't run requested scripts
- _SCRIPTS="$(ls /lib/live/config/*)"
+ LIVE_CONFIGS=""
LIVE_NOCONFIGS="${_PARAMETER#*noconfig=}"
+ _SCRIPTS="$(ls /lib/live/config/*)"
+ ;;
+
+ live-noconfig|noconfig)
+ # Don't run any script
+ LIVE_CONFIGS=""
+ LIVE_NOCONFIGS=""
+ _SCRIPTS=""
;;
# Shortcuts
live-config.noroot|noroot)
# Disable root access, no matter what mechanism
- _SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
- LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
-
- _NO_ROOT="true"
+ _NOROOT="true"
;;
live-config.noautologin|noautologin)
# Disables both console and graphical autologin.
- _SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
- LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lightdm,lxdm,nodm,slim,upstart,xinit"
+ _NOAUTOLOGIN="true"
;;
live-config.nottyautologin|nottyautologin)
# Disables console autologin.
- _SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
- LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,upstart"
+ _NOTTYAUTOLOGIN="true"
;;
live-config.nox11autologin|nox11autologin)
- # Disables graphical autologin, no matter what
- # mechanism
- _SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
- LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lightdm,lxdm,nodm,slim,xinit"
+ # Disables graphical autologin, no matter what mechanism
+ _NOX11AUTOLOGIN="true"
;;
# Special options
@@ -93,6 +96,35 @@ Cmdline ()
esac
done
+ # Exclude shortcuts specific scripts
+ case "${_NO_ROOT}" in
+ true)
+ # Disable root access, no matter what mechanism
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
+ ;;
+ esac
+
+ case "${_NOAUTOLOGIN}" in
+ true)
+ # Disables both console and graphical autologin.
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lightdm,lxdm,nodm,slim,upstart,xinit"
+ ;;
+ esac
+
+ case "${_NOTTYAUTOLOGIN}" in
+ true)
+ # Disables console autologin.
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,upstart"
+ ;;
+ esac
+
+ case "${_NOX11AUTOLOGIN}" in
+ true)
+ # Disables graphical autologin, no matter what mechanism
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lightdm,lxdm,nodm,slim,xinit"
+ ;;
+ esac
+
# Include requested scripts
if [ -n "${LIVE_CONFIGS}" ]
then
@@ -129,7 +161,7 @@ Trap ()
return ${_RETURN}
}
-Start_network ()
+Setup_network ()
{
if [ -z "${_NETWORK}" ] && [ -e /etc/init.d/live-config ]
then
@@ -154,7 +186,7 @@ Main ()
{
if [ ! -e /proc/version ]
then
- mount -n -t proc -onodev,noexec,nosuid -odefaults proc /proc
+ mount -n -t proc -o${PROC_OPTIONS} -odefaults proc /proc
fi
_CMDLINE="$(cat /proc/cmdline)"
@@ -164,12 +196,21 @@ Main ()
exit 0
fi
- echo -n "live-config:"
+ # Setting up log redirection
+ rm -f /var/log/live/config.log
+ rm -f /var/log/live/config.pipe
+
+ mkdir -p /var/log/live
+ mkfifo /var/log/live/config.pipe
+ tee < /var/log/live/config.pipe /var/log/live/config.log &
+ exec > /var/log/live/config.pipe 2>&1
+
+ echo -n "live-config:" > /var/log/live/config.pipe 2>&1
trap 'Trap' EXIT HUP INT QUIT TERM
- # Reading configuration file from filesystem and live-media
- for _FILE in /etc/live/config.conf /etc/live/config.d/*.conf \
- /live/image/live/config.conf /live/image/live/config.d/*.conf
+ # Reading configuration files from filesystem and live-media
+ for _FILE in /etc/live/config.conf /etc/live/config/* \
+ /lib/live/mount/medium/live/config.conf /lib/live/mount/medium/live/config/*
do
if [ -e "${_FILE}" ]
then
@@ -177,7 +218,7 @@ Main ()
fi
done
- # Reading kernel command line
+ # Processing command line
Cmdline
case "${LIVE_DEBUG}" in
@@ -186,19 +227,20 @@ Main ()
;;
esac
- mkdir -p /var/log/live
-
# Configuring system
_SCRIPTS="$(echo ${_SCRIPTS} | sed -e 's| |\n|g' | sort -u)"
for _SCRIPT in ${_SCRIPTS}
do
- [ "${_LIVE_DEBUG}" = "true" ] && echo "[$(date +'%F %T')] live-config: ${_SCRIPT}" >> /var/log/live/config.log
+ [ "${LIVE_DEBUG}" = "true" ] && echo "[$(date +'%F %T')] live-config: ${_SCRIPT}" > /var/log/live/config.pipe
- . ${_SCRIPT} 2>&1 | tee -a /var/log/live/config.log
+ . ${_SCRIPT} > /var/log/live/config.pipe 2>&1
done
- echo "."
+ echo "." > /var/log/live/config.pipe
+
+ # Cleaning up log redirection
+ rm -f /var/log/live/config.pipe
}
-Main
+Main ${@}
diff -Naurp live-config.orig/share/xserver-xorg/nvidia.conf live-config/share/xserver-xorg/nvidia.conf
--- live-config.orig/share/xserver-xorg/nvidia.conf 1970-01-01 01:00:00.000000000 +0100
+++ live-config/share/xserver-xorg/nvidia.conf 2013-02-15 09:38:24.064897201 +0100
@@ -0,0 +1,5 @@
+Section "Device"
+ Identifier "Default screen"
+ Driver "nvidia"
+ Option "NoLogo" "true"
+EndSection
diff -Naurp live-config.orig/share/xserver-xorg/vboxvideo.conf live-config/share/xserver-xorg/vboxvideo.conf
--- live-config.orig/share/xserver-xorg/vboxvideo.conf 1970-01-01 01:00:00.000000000 +0100
+++ live-config/share/xserver-xorg/vboxvideo.conf 2013-02-15 09:38:24.064897201 +0100
@@ -0,0 +1,9 @@
+Section "Device"
+ Identifier "Default screen"
+ Driver "vboxvideo"
+EndSection
+
+Section "InputDevice"
+ Identifier "Default mouse"
+ Driver "vboxmouse"
+EndSection
diff -Naurp live-config.orig/VERSION live-config/VERSION
--- live-config.orig/VERSION 2013-02-15 10:34:51.943043882 +0100
+++ live-config/VERSION 2013-02-15 10:34:10.452722877 +0100
@@ -1 +1 @@
-3.0~a43-1
+3.0.21-1
--- End Message ---