From 0da3f8ba248d3f0002b79ae6f9098e61953d45c5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 29 Mar 2007 15:34:01 +0200 Subject: [PATCH 01/16] config_console(): support setting of bps via bootoption serial --- autoconfig.functions | 15 +++++++++++++-- debian/changelog | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index e129cae..b130694 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -509,10 +509,21 @@ fi # activate serial console {{{ config_console(){ if checkbootparam "console"; then - einfo "Bootoption (for serial) console detected. Activating mgetty." + einfo "Bootoption (for serial) console detected." + eindent + if [ -r /etc/mgetty/mgetty.config ] ; then + MODE=$(getbootparam console | awk -F, '{print $2}') + MODE=${MODE%%n*} + [ -n "$MODE" ] || MODE=9600 # default mode + einfo "Setting speed in /etc/mgetty/mgetty.config to $MODE bps" + sed -i "s/speed [0-9]*/speed $MODE/" /etc/mgetty/mgetty.config ; eend $? + fi + + einfo "Activating mgetty." sed -i 's/^#T0/T0/' /etc/inittab sed -i 's/^#T1/T1/' /etc/inittab - /sbin/telinit q ; eend $? + /sbin/telinit q ; eend $? + eoutdent fi } # }}} diff --git a/debian/changelog b/debian/changelog index ffd84be..7864ced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-autoconfig (0.6.28) unstable; urgency=low + + * config_console(): support setting of bps via bootoption + serial as requested by Marc 'Zugschlus' Haber, see + http://blog.zugschlus.de/archives/530-using-grml-to-prepare-LVM-surgery.html + + -- Michael Prokop Thu, 29 Mar 2007 15:33:10 +0200 + grml-autoconfig (0.6.27) unstable; urgency=low * grml-autoconfig script: make sure CONFIG_FSTAB matches only -- 2.1.4 From 6278b868754b2306d9032a86e33f20e06824841b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 29 Mar 2007 15:34:46 +0200 Subject: [PATCH 02/16] Added tag 0.6.28 for changeset 4b46b152011b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9f61f72..593042d 100644 --- a/.hgtags +++ b/.hgtags @@ -33,3 +33,4 @@ d18c15db745dfe008a227a5ccda00f2d65946d53 0.6.22 440fc3ecf68f419d445446e80203d8dfbaef17a4 0.6.25 7e0ead45ac554271d69acb3bc3109d240652fad7 0.6.26 f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 +4b46b152011b552abf6d160b40145bd29446cb4b 0.6.28 -- 2.1.4 From 330efcb5d2a6f94018f48292932077f2dd1dd4a5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 3 Apr 2007 17:04:00 +0200 Subject: [PATCH 03/16] config_language(): rework the way unicode_start and consolechars are used --- autoconfig.functions | 65 ++++++++++++++++++++++++++-------------------------- debian/changelog | 9 ++++++++ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index b130694..527dd80 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Mär 25 12:32:37 CEST 2007 [mika] +# Latest change: Die Apr 03 17:02:59 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -270,39 +270,40 @@ config_language(){ [ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard - # Set default keyboard before interactive setup - if [ -n "$KEYTABLE" ] ; then - einfo "Running loadkeys for ${WHITE}${KEYTABLE}${NORMAL} in background" - loadkeys -q $KEYTABLE & - eend $? - fi - - if [ -n "$CONSOLEFONT" ] ; then - einfo "Running consolechars using ${CONSOLEFONT}" - consolechars -f $CONSOLEFONT || consolechars -d - eend $? - fi + # activate unicode console if running within utf8 environment + if [ -r /etc/default/locale ] ; then + if grep -q "LANG=.*UTF" /etc/default/locale ; then + einfo "Setting up unicode environment." + unicode_start + eend $? + fi + fi - # we have to set up all consoles, therefore loop it over all ttys: - if [ -n "$CHARMAP" ] ; then - einfo "Running consolechars for ${CHARMAP}" - NUM_CONSOLES=`fgconsole --next-available` - NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1` - [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6 - for vc in `seq 0 ${NUM_CONSOLES}` ; do - consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? - done - eend ${RC} - fi + # Set default keyboard before interactive setup + if [ -n "$KEYTABLE" ] ; then + einfo "Running loadkeys for ${WHITE}${KEYTABLE}${NORMAL} in background" + loadkeys -q $KEYTABLE & + eend $? + fi - # activate unicode console if running within utf8 environment - if [ -r /etc/default/locale ] ; then - if grep -q "LANG=.*UTF" /etc/default/locale ; then - einfo "Setting up unicode environment." - unicode_start - eend $? - fi - fi + # we have to set up all consoles, therefore loop it over all ttys: + NUM_CONSOLES=`fgconsole --next-available` + NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1` + [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6 + if [ -n "$CHARMAP" ] ; then + einfo "Running consolechars for ${CHARMAP}" + for vc in `seq 0 ${NUM_CONSOLES}` ; do + consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$? + done + eend $RC + fi + if [ -n "$CONSOLEFONT" ] ; then + einfo "Running consolechars using ${CONSOLEFONT}" + for vc in `seq 0 ${NUM_CONSOLES}` ; do + consolechars --tty=/dev/tty${vc} -f $CONSOLEFONT || consolechars --tty=/dev/tty${vc} -d + done + eend $? + fi eoutdent } diff --git a/debian/changelog b/debian/changelog index 7864ced..c3e84a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-autoconfig (0.6.29) unstable; urgency=low + + * config_language(): rework the way unicode_start and consolechars + are used. This should fix a race condition with german umlauts + within for example GNU screen so the umlauts work on tty1 but + not on other consoles. + + -- Michael Prokop Tue, 3 Apr 2007 17:03:02 +0200 + grml-autoconfig (0.6.28) unstable; urgency=low * config_console(): support setting of bps via bootoption -- 2.1.4 From c99d0f898981f2b5e4eb023cc013349f9025fbb0 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 3 Apr 2007 17:04:55 +0200 Subject: [PATCH 04/16] Added tag 0.6.29 for changeset 32f3c96de528 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 593042d..61a495f 100644 --- a/.hgtags +++ b/.hgtags @@ -34,3 +34,4 @@ d18c15db745dfe008a227a5ccda00f2d65946d53 0.6.22 7e0ead45ac554271d69acb3bc3109d240652fad7 0.6.26 f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 4b46b152011b552abf6d160b40145bd29446cb4b 0.6.28 +32f3c96de5280880aa56273b0e07588d7838d14d 0.6.29 -- 2.1.4 From cae8d6a90b42088c284095130c68b2a9093c39a9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 4 Apr 2007 21:34:09 +0200 Subject: [PATCH 05/16] additional check in config_vmware, added config_distri() --- autoconfig | 9 +++++---- autoconfig.functions | 22 ++++++++++++++++------ autoconfig.small | 9 +++++---- debian/changelog | 9 +++++++++ grml-autoconfig | 4 +++- 5 files changed, 38 insertions(+), 15 deletions(-) diff --git a/autoconfig b/autoconfig index ee88baa..45f3d0d 100644 --- a/autoconfig +++ b/autoconfig @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Mär 25 12:45:13 CEST 2007 [mika] +# Latest change: Mit Apr 04 21:33:40 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -58,26 +58,26 @@ CONFIG_BLIND='yes' # check for blind option or brltty CONFIG_CDROM_PERM='yes' # for burning on IDE-CD-Roms, k3b (and others) check for special permissions CONFIG_CDROM_SCRIPTS='yes' # run scripts from /cdrom/scripts CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam -CONFIG_DMA='yes' # Enable DMA for all IDE drives CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories CONFIG_DEBNET='yes' # search for /etc/network/interfaces on partitions and set up network afterwards CONFIG_DEBS='yes' # check for bootoption debs for installing .debs CONFIG_DEBUG='yes' # activate start of shells during startup at several stages CONFIG_DISCOVER='no' # use discover for hardware detection CONFIG_DISTCC='yes' # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE +CONFIG_DISTRI='yes' # support some customization via bootoption distri +CONFIG_DMA='yes' # Enable DMA for all IDE drives CONFIG_EXTRACT='yes' # specify which (only in combination with bootparam myconfig/netconfig useful) CONFIG_FAST='yes' # skip startup of w3m on tty1 CONFIG_FIREWIRE_DEV='no' # bugfix for kernel >=2.6.11 - create some firewire-devices CONFIG_FIX_PASSWD='yes' # fix unionfs-problem with passwd CONFIG_FIX_UNIONFS='yes' # fix/workaround for unionfs -CONFIG_USERFSTAB='yes' # check for username of uid 1000 CONFIG_FWTIMEOUT='yes' # set timeout for firmware loading CONFIG_GRML2HD='yes' # check for 'grml2hd' bootoption CONFIG_HOMEDIR='yes' # check for persistent homedir option CONFIG_HOSTNAME='yes' # set hostname to 'grml' on systems running from CD -CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HOTPLUG_AGENT='no' # deactivate specific hotplug agent(s) via bootparam CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam +CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HWINFO='no' # run hwinfo for module-detection (requires bootparam 'hwinfo'!) CONFIG_INTERACTIVE='yes' # check for expert-mode as bootparam CONFIG_KERNEL='yes' # display information on running kernel @@ -104,6 +104,7 @@ CONFIG_SWSPEAK='yes' # run software synthesizer via speakup CONFIG_TESTCD='yes' # CD checker CONFIG_TIME='yes' # set clock, check for bootparam utc/gmt [only in live-mode] CONFIG_TIMEZONE='yes' # get bootparam 'tz' and set it as /etc/localtime [only in live-mode] +CONFIG_USERFSTAB='yes' # check for username of uid 1000 CONFIG_VMWARE='yes' # vmware specific stuff (use xorg.conf.vmware) CONFIG_WELCOME='yes' # play welcome sound (audio) CONFIG_WONDERSHAPER='yes' # start wondershaper with options provided via bootparam diff --git a/autoconfig.functions b/autoconfig.functions index 527dd80..2209e5f 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -389,12 +389,10 @@ if checkbootparam novmware ; then ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0 else if [ -z "$INSTALLED" ] ; then - if ! checkbootparam qemu ; then - if vmware-detect ; then - if [ -r /etc/X11/xorg.conf.vmware ] ; then - einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" - cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? - fi + if ! checkbootparam qemu || vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then + if [ -r /etc/X11/xorg.conf.vmware ] ; then + einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" + cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? fi fi fi @@ -2131,6 +2129,18 @@ fi } # }}} +# {{{ Support customization +config_distri(){ +if checkbootparam "distri"; then + DISTRI="$(getbootparam 'distri' 2>>$DEBUG)" + if [ -r /cdrom/desktop/"$DISTRI".jpg ] ; then + [ -n "$BOOTDEBUG" ] && einfo "Debug: bootoption distri found and file /cdrom/desktop/$DISTRI present" && eend 0 + cp /cdrom/desktop/"$DISTRI".jpg /usr/share/grml/desktop.jpg + fi +fi +} +# }}} + ### {{{ backwards compatible stuff config_environment(){ ewarn "config_environment is deprecated. Please set CONFIG_ENVIRONMENT in /etc/grml/autoconfig to 'no'." ; eend 0 diff --git a/autoconfig.small b/autoconfig.small index 199a937..7877c39 100644 --- a/autoconfig.small +++ b/autoconfig.small @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Mär 25 12:45:17 CEST 2007 [mika] +# Latest change: Mit Apr 04 21:33:42 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -58,26 +58,26 @@ CONFIG_BLIND='yes' # check for blind option or brltty CONFIG_CDROM_PERM='yes' # for burning on IDE-CD-Roms, k3b (and others) check for special permissions CONFIG_CDROM_SCRIPTS='yes' # run scripts from /cdrom/scripts CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam -CONFIG_DMA='yes' # Enable DMA for all IDE drives CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories CONFIG_DEBNET='yes' # search for /etc/network/interfaces on partitions and set up network afterwards CONFIG_DEBS='yes' # check for bootoption debs for installing .debs CONFIG_DEBUG='yes' # activate start of shells during startup at several stages CONFIG_DISCOVER='no' # use discover for hardware detection CONFIG_DISTCC='no' # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE +CONFIG_DISTRI='yes' # support some customization via bootoption distri +CONFIG_DMA='yes' # Enable DMA for all IDE drives CONFIG_EXTRACT='yes' # specify which (only in combination with bootparam myconfig/netconfig useful) CONFIG_FAST='yes' # skip startup of w3m on tty1 CONFIG_FIREWIRE_DEV='no' # bugfix for kernel >=2.6.11 - create some firewire-devices CONFIG_FIX_PASSWD='yes' # fix unionfs-problem with passwd CONFIG_FIX_UNIONFS='yes' # fix/workaround for unionfs -CONFIG_USERFSTAB='yes' # check for username of uid 1000 CONFIG_FWTIMEOUT='yes' # set timeout for firmware loading CONFIG_GRML2HD='yes' # check for 'grml2hd' bootoption CONFIG_HOMEDIR='yes' # check for persistent homedir option CONFIG_HOSTNAME='yes' # set hostname to 'grml' on systems running from CD -CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HOTPLUG_AGENT='no' # deactivate specific hotplug agent(s) via bootparam CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam +CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HWINFO='no' # run hwinfo for module-detection (requires bootparam 'hwinfo'!) CONFIG_INTERACTIVE='yes' # check for expert-mode as bootparam CONFIG_KERNEL='yes' # display information on running kernel @@ -104,6 +104,7 @@ CONFIG_SWSPEAK='no' # run software synthesizer via speakup CONFIG_TESTCD='yes' # CD checker CONFIG_TIME='yes' # set clock, check for bootparam utc/gmt [only in live-mode] CONFIG_TIMEZONE='yes' # get bootparam 'tz' and set it as /etc/localtime [only in live-mode] +CONFIG_USERFSTAB='yes' # check for username of uid 1000 CONFIG_VMWARE='no' # vmware specific stuff (use xorg.conf.vmware) CONFIG_WELCOME='yes' # play welcome sound (audio) CONFIG_WONDERSHAPER='yes' # start wondershaper with options provided via bootparam diff --git a/debian/changelog b/debian/changelog index c3e84a0..c2062ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-autoconfig (0.6.30) unstable; urgency=low + + * config_vmware(): if vmware-detect fails (in grml64 currently + for example) additionally check for bootimage vmware. + * config_distri(): new code which supports setting wallpaper + via /cdrom/desktop/$DISTRI.jpg + + -- Michael Prokop Wed, 4 Apr 2007 21:28:49 +0200 + grml-autoconfig (0.6.29) unstable; urgency=low * config_language(): rework the way unicode_start and consolechars diff --git a/grml-autoconfig b/grml-autoconfig index 5500fde..433a8e0 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Mär 25 12:45:38 CEST 2007 [mika] +# Latest change: Mit Apr 04 21:34:05 CEST 2007 [mika] ################################################################################ # http://wiki.debian.org/LSBInitScripts => @@ -252,6 +252,8 @@ checkvalue $CONFIG_AUTOMOUNT && config_automount checkvalue $CONFIG_DISTCC && config_distcc +checkvalue $CONFIG_DISTRI && config_distri + checkvalue $CONFIG_BLANKING && config_blanking [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||||">/dev/tty7 -- 2.1.4 From 741ebecdd0f7076e285b67c9169bde844cd2400d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 4 Apr 2007 21:37:17 +0200 Subject: [PATCH 06/16] Added tag 0.6.30 for changeset 3d259e4912af --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 61a495f..4e3677f 100644 --- a/.hgtags +++ b/.hgtags @@ -35,3 +35,4 @@ d18c15db745dfe008a227a5ccda00f2d65946d53 0.6.22 f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 4b46b152011b552abf6d160b40145bd29446cb4b 0.6.28 32f3c96de5280880aa56273b0e07588d7838d14d 0.6.29 +3d259e4912aff1b3e414d67f1d174e6d3d3c4906 0.6.30 -- 2.1.4 From a77bee3682d1ce4068f4e6d57f1d689a80b05ec0 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 6 Apr 2007 23:42:08 +0200 Subject: [PATCH 07/16] language-functions: applied patch by Jan-Pieter Jacobs --- debian/changelog | 10 +++++++++ language-functions | 66 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2062ba..c1ccab4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +grml-autoconfig (0.6.31) unstable; urgency=low + + * language-functions: applied patch by Jan-Pieter Jacobs + which improves and extends locales for Belgian. Thanks! + We now have bed (dutch), bef (french) and beg (german) + (in iso and utf8 versions as usual) plus the normal + 'be' stuff (with updated locales now) of course. + + -- Michael Prokop Fri, 6 Apr 2007 23:34:04 +0200 + grml-autoconfig (0.6.30) unstable; urgency=low * config_vmware(): if vmware-detect fails (in grml64 currently diff --git a/language-functions b/language-functions index 766e1fe..839b583 100644 --- a/language-functions +++ b/language-functions @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Dez 16 17:45:30 CET 2006 [mika] +# Latest change: Fre Apr 06 23:41:38 CEST 2007 [mika] ################################################################################ # The default language/keyboard to use. This CAN NOT be autoprobed. @@ -59,9 +59,9 @@ case "$LANGUAGE" in KDEKEYBOARDS="us,fr" TZ="Australia/Sydney" ;; - be-iso) - # Belgian version - LANGUAGE="be" + be-iso|bed-iso) + # Belgian version (default and dutch one) + LANGUAGE="nl" COUNTRY="be" LANG="C" KEYTABLE="be2-latin1" @@ -71,11 +71,61 @@ case "$LANGUAGE" in KDEKEYBOARDS="us,de,fr" TZ="Europe/Brussels" ;; - be|be-utf8) - # Belgian version (UTF8) - LANGUAGE="be_BY:be" + be|be-utf8|bed|bed-utf8) + # Belgian version (default and dutch one) (UTF8) + LANGUAGE="nl_BE:nl" COUNTRY="be" - LANG="be_BY.UTF-8" + LANG="nl_BE.UTF-8" + KEYTABLE="be2-latin1" + XKEYBOARD="be" + KDEKEYBOARD="be" + CHARSET="utf8" + # Additional KDE Keyboards + KDEKEYBOARDS="us,de,fr" + TZ="Europe/Brussels" + ;; + bef-iso) + # Belgian version (french) + LANGUAGE="fr" + COUNTRY="be" + LANG="C" + KEYTABLE="be2-latin1" + XKEYBOARD="be" + KDEKEYBOARD="be" + CHARSET="iso8859-15" + KDEKEYBOARDS="us,de,fr" + TZ="Europe/Brussels" + ;; + bef|bef-utf8) + # Belgian version (french) (UTF8) + LANGUAGE="fr_BE:fr" + COUNTRY="be" + LANG="fr_BE.UTF-8" + KEYTABLE="be2-latin1" + XKEYBOARD="be" + KDEKEYBOARD="be" + CHARSET="utf8" + # Additional KDE Keyboards + KDEKEYBOARDS="us,de,fr" + TZ="Europe/Brussels" + ;; + beg-iso) + # Belgian version (german) + LANGUAGE="de" + COUNTRY="be" + LANG="C" + KEYTABLE="be2-latin1" + XKEYBOARD="be" + KDEKEYBOARD="be" + CHARSET="iso8859-15" + KDEKEYBOARDS="us,de,fr" + TZ="Europe/Brussels" + ;; + beg|beg-utf8) + # Belgian version (german) (UTF8) + LANGUAGE="de_BE:de" + COUNTRY="be" + LANG="de_BE.UTF-8" KEYTABLE="be2-latin1" XKEYBOARD="be" KDEKEYBOARD="be" -- 2.1.4 From 8176561f66e1cd86ba0b744a51b28e2bf1d5b7ee Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 6 Apr 2007 23:43:19 +0200 Subject: [PATCH 08/16] Added tag 0.6.31 for changeset 38452f6b8e7a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4e3677f..62141aa 100644 --- a/.hgtags +++ b/.hgtags @@ -36,3 +36,4 @@ f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 4b46b152011b552abf6d160b40145bd29446cb4b 0.6.28 32f3c96de5280880aa56273b0e07588d7838d14d 0.6.29 3d259e4912aff1b3e414d67f1d174e6d3d3c4906 0.6.30 +38452f6b8e7a76ebb2dee5cee3e9081bcf32e302 0.6.31 -- 2.1.4 From f09cbabaa035762292b3c3965b7e95550a73b867 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 9 Apr 2007 13:41:03 +0200 Subject: [PATCH 09/16] Fix logical structure of config_vmware(). --- autoconfig.functions | 10 ++++++---- debian/changelog | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 2209e5f..4b603a5 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -389,10 +389,12 @@ if checkbootparam novmware ; then ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0 else if [ -z "$INSTALLED" ] ; then - if ! checkbootparam qemu || vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then - if [ -r /etc/X11/xorg.conf.vmware ] ; then - einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" - cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? + if vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then + if ! checkbootparam qemu ; then + if [ -r /etc/X11/xorg.conf.vmware ] ; then + einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf" + cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $? + fi fi fi fi diff --git a/debian/changelog b/debian/changelog index c1ccab4..4172b40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-autoconfig (0.6.32) unstable; urgency=low + + * Fix logical structure of config_vmware(). + + -- Michael Prokop Mon, 9 Apr 2007 13:40:40 +0200 + grml-autoconfig (0.6.31) unstable; urgency=low * language-functions: applied patch by Jan-Pieter Jacobs -- 2.1.4 From 24e1364a3b5f75c1102f2191584f485c3a8a2778 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 9 Apr 2007 13:42:08 +0200 Subject: [PATCH 10/16] Added tag 0.6.32 for changeset 5420bcd0feea --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 62141aa..c557768 100644 --- a/.hgtags +++ b/.hgtags @@ -37,3 +37,4 @@ f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 32f3c96de5280880aa56273b0e07588d7838d14d 0.6.29 3d259e4912aff1b3e414d67f1d174e6d3d3c4906 0.6.30 38452f6b8e7a76ebb2dee5cee3e9081bcf32e302 0.6.31 +5420bcd0feeac5322cec6cb9d5e62afc32bed4b4 0.6.32 -- 2.1.4 From 04397dce21be5642ea52a49c3c072ce73d290cf1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 13 Apr 2007 12:50:23 +0200 Subject: [PATCH 11/16] Do not execute unicode_start on grml-small in live-mode. --- autoconfig.functions | 11 +++++++---- debian/changelog | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 4b603a5..44034e7 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Die Apr 03 17:02:59 CEST 2007 [mika] +# Latest change: Fre Apr 13 12:49:52 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -273,9 +273,12 @@ config_language(){ # activate unicode console if running within utf8 environment if [ -r /etc/default/locale ] ; then if grep -q "LANG=.*UTF" /etc/default/locale ; then - einfo "Setting up unicode environment." - unicode_start - eend $? + if checkgrmlsmall && [ -z "$INSTALLED" ] ; then + ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0 + else + einfo "Setting up unicode environment." + unicode_start ; eend $? + fi fi fi diff --git a/debian/changelog b/debian/changelog index 4172b40..60203c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-autoconfig (0.6.33) unstable; urgency=low + + * Do not execute unicode_start on grml-small in live-mode. + [Testing: issue193] + + -- Michael Prokop Fri, 13 Apr 2007 12:49:56 +0200 + grml-autoconfig (0.6.32) unstable; urgency=low * Fix logical structure of config_vmware(). -- 2.1.4 From 60095fd63e006d136a5e0814b1fffb997e378da1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 13 Apr 2007 12:52:09 +0200 Subject: [PATCH 12/16] Added tag 0.6.33 for changeset bd78aa1e6fd9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c557768..6424f44 100644 --- a/.hgtags +++ b/.hgtags @@ -38,3 +38,4 @@ f64097a443ec3bcf787f6e2509319de7fd81a4e0 0.6.27 3d259e4912aff1b3e414d67f1d174e6d3d3c4906 0.6.30 38452f6b8e7a76ebb2dee5cee3e9081bcf32e302 0.6.31 5420bcd0feeac5322cec6cb9d5e62afc32bed4b4 0.6.32 +bd78aa1e6fd9940b52e944626d9799c69a7fc053 0.6.33 -- 2.1.4 From 180b35a6adcd6c76bce96d6eb1b0935c43106c13 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 15 Apr 2007 12:13:22 +0200 Subject: [PATCH 13/16] Code rewrite of config_fstab() --- autoconfig.functions | 349 ++++++++++++++++++++++++++------------------------- debian/changelog | 7 ++ 2 files changed, 183 insertions(+), 173 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 44034e7..ae4edd7 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -274,7 +274,7 @@ config_language(){ if [ -r /etc/default/locale ] ; then if grep -q "LANG=.*UTF" /etc/default/locale ; then if checkgrmlsmall && [ -z "$INSTALLED" ] ; then - ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0 + ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0 else einfo "Setting up unicode environment." unicode_start ; eend $? @@ -996,118 +996,117 @@ config_fstab(){ NOSWAP="yes" # we do not use swap by default! if checkbootparam "swap" -o checkbootparam "anyswap" ; then NOSWAP='' + checkbootparam "anyswap" && export ANYSWAP='yes' || export ANYSWAP="" fi if checkbootparam "nofstab" -o checkbootparam "forensic" ; then ewarn "Skipping /etc/fstab creation as requested on boot commandline." ; eend 0 else - checkbootparam "anyswap" && export ANYSWAP='yes' || export ANYSWAP="" einfo "Scanning for harddisk partitions and creating /etc/fstab. (Disable this via boot option: nofstab)" iszsh && setopt nonomatch if [ -x /usr/sbin/rebuildfstab ] ; then - config_userfstab || fstabuser=grml - /usr/sbin/rebuildfstab -r -u $fstabuser -g $fstabuser ; eend $? + config_userfstab || fstabuser=grml + /usr/sbin/rebuildfstab -r -u $fstabuser -g $fstabuser ; eend $? else - ewarn "Command rebuildfstab not found. Install package grml-rebuildfstab." ; eend 1 + ewarn "Command rebuildfstab not found. Install package grml-rebuildfstab." ; eend 1 fi - if [ -e /var/run/rebuildfstab.pid ]; then - # Another instance of rebuildfstab, probably from hotplug, is still running, so just wait. - sleep 8 - fi -fi -# Scan for swap, config, homedir -if [ -z "$NOSWAP" ]; then - einfo "Searching for swap partition(s) as requested." -fi -GRML_IMG="" -GRML_SWP="" -HOMEDIR="$(getbootparam home)" -if [ -n "$partitions" ]; then - while read p m f relax; do - case "$p" in *fd0*|*proc*|*sys*|*\#*) continue;; esac - partoptions="users,exec" - fnew="" - case "$f" in swap) - eindent - if [ -n "$NOSWAP" ]; then - if [ -z "$INSTALLED" ] ; then - ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0 - fi - else - case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in - S1SUSP|S2SUSP|pmdisk|[zZ]*) - if [ -n "$ANYSWAP" ] ; then - einfo "Using swap partition ${WHITE}${p}${NORMAL} [bootoption anyswap found]." - swapon $p 2>>$DEBUG ; eend $? - else - ewarn "Suspend signature on ${WHITE}${p}${NORMAL} found, not using as swap. (Force usage via boot option: anyswap)" - fi - ;; - *) - if [[ "$p" == LABEL* ]] ; then - p=$(blkid -t $p | awk -F: '{print $1}') - fi - if grep -q $p /proc/swaps ; then - ewarn "Not using swap partition ${WHITE}${p}${NORMAL} as it is already in use." ; eend 0 - else - einfo "Using swap partition ${WHITE}${p}${NORMAL}." - swapon $p 2>>$DEBUG ; eend $? - fi - ;; - esac - fi - eoutdent - continue - ;; - esac -# Create mountdir if not already present, but don't try to create stuff like /proc/bus/usb -# Notice: grml-rebuildfstab >= 0.3-1 handles this now -# case "$m" in *none*|*proc*|*sys*|'') continue ;; esac -# [ -d "$m" ] || mkdir -p "$m" -# WARNING: NTFS RW mounts are only safe since Kernel 2.6.11 - [ "$f" = "ntfs" -a "${KERNEL%.*}" != "2.6" ] && continue - MOUNTOPTS="ro" - case "$f" in - vfat|msdos|ntfs) MOUNTOPTS="$MOUNTOPTS,uid=${fstabuser},gid=${fstabuser}" ;; - ext2|ext3|reiserfs|jfs|reiser4|xfs) MOUNTOPTS="$MOUNTOPTS,noatime" ;; - *) continue ;; - # *) NONEFOUND='1'; continue ;; - esac - if [ -z "$NOSWAP" ] ; then - mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue - # Activate swapfile, if exists - SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)" - fi - if [ -z "$NOSWAP" -a -n "$SWAPFILE" -a -f "$SWAPFILE" ]; then - mount -o remount,rw $m - if swapon "$SWAPFILE" 2>>$DEBUG ; then - einfo "Using GRML swapfile ${SWAPFILE}." - fnew="$SWAPFILE swap swap defaults 0 0" - stringinfile "$fnew" "/etc/fstab" || echo "$fnew" >> /etc/fstab - GRML_SWP="$GRML_SWP $SWAPFILE" - eend 0 - fi - mount -o remount,ro $m 2>>$DEBUG - fi - IMAGE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ii][Mm][Gg] 2>/dev/null)" - if [ -z "$INSTALLED" -a -z "$GRML_IMG" -a -n "$IMAGE" -a -f "$IMAGE" ]; then - if [ -n "$HOMEDIR" ]; then - if [ "$HOMEDIR" != "scan" -a "$HOMEDIR" != "$IMAGE" -a "$HOMEDIR" != "${IMAGE%/*.*}" ]; then - continue - fi - fi - if type -a grml-image >/dev/null 2>&1 && grml-image "$IMAGE" /dev/console 2>&1; then - GRML_IMG="$IMAGE" - mount -o remount,ro $m 2>>$DEBUG - fi - fi - eend 0 - # Umount, if not in use - umount -r $m 2>/dev/null - done </dev/null)" in + S1SUSP|S2SUSP|pmdisk|[zZ]*) + if [ -n "$ANYSWAP" ] ; then + einfo "Using swap partition ${WHITE}${p}${NORMAL} [bootoption anyswap found]." + swapon $p 2>>$DEBUG ; eend $? + else + ewarn "Suspend signature on ${WHITE}${p}${NORMAL} found, not using as swap. (Force usage via boot option: anyswap)" + fi + ;; + *) + if [[ "$p" == LABEL* ]] ; then + p=$(blkid -t $p | awk -F: '{print $1}') + fi + if grep -q $p /proc/swaps ; then + ewarn "Not using swap partition ${WHITE}${p}${NORMAL} as it is already in use." ; eend 0 + else + einfo "Using swap partition ${WHITE}${p}${NORMAL}." + swapon $p 2>>$DEBUG ; eend $? + fi + ;; + esac # dd-check + fi # -n "$NOSWAP + eoutdent + continue + ;; + esac # it's a swap partition? + + # mount read-only + MOUNTOPTS="ro" + case "$f" in + vfat|msdos|ntfs) MOUNTOPTS="$MOUNTOPTS,uid=${fstabuser},gid=${fstabuser}" ;; + ext2|ext3|reiserfs|jfs|reiser4|xfs) MOUNTOPTS="$MOUNTOPTS,noatime" ;; + *) continue ;; + # *) NONEFOUND='1'; continue ;; + esac + + # use a swapfile + if [ -z "$NOSWAP" ] ; then + mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue + # Activate swapfile, if exists + SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)" + fi + if [ -z "$NOSWAP" -a -n "$SWAPFILE" -a -f "$SWAPFILE" ]; then + mount -o remount,rw $m && MOUNTED=1 + if swapon "$SWAPFILE" 2>>$DEBUG ; then + einfo "Using GRML swapfile ${SWAPFILE}." + fnew="$SWAPFILE swap swap defaults 0 0" + stringinfile "$fnew" "/etc/fstab" || echo "$fnew" >> /etc/fstab + GRML_SWP="$GRML_SWP $SWAPFILE" + eend 0 + fi + mount -o remount,ro $m 2>>$DEBUG && MOUNTED=1 + fi + + # use a image as home + IMAGE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ii][Mm][Gg] 2>/dev/null)" + if [ -z "$GRML_IMG" -a -n "$IMAGE" -a -f "$IMAGE" ]; then + if [ -n "$HOMEDIR" ]; then + if [ "$HOMEDIR" != "scan" -a "$HOMEDIR" != "$IMAGE" -a "$HOMEDIR" != "${IMAGE%/*.*}" ]; then + continue + fi + fi + if type -a grml-image >/dev/null 2>&1 && grml-image "$IMAGE" /dev/console 2>&1; then + GRML_IMG="$IMAGE" + mount -o remount,ro $m 2>>$DEBUG && MOUNTED=1 + fi + fi + eend 0 + + # Umount, if not in use + [ -n "$MOUNTED" ] && umount -r $m 2>/dev/null + + done <&1)" - RC="$?" - fi - [ "$RC" = "0" ] && eend 0 || ( eerror "${ERROR}" ; eend 1 ) - fi - break + HOMEDIR="$(getbootparam home)" + MYHOMEDEVICE="" + MYHOMEMOUNTPOINT="" + MYHOMEDIR="" + if [ -n "$HOMEDIR" ]; then + einfo "Bootoption home detected." && eend 0 + case "$HOMEDIR" in + /dev/*) + MYHOMEDEVICE="${HOMEDIR##/dev/}" + MYHOMEDEVICE="/dev/${MYHOMEDEVICE%%/*}" + MYHOMEMOUNTPOINT="/mnt/${MYHOMEDEVICE##/dev/}" + MYHOMEDIR="/mnt/${HOMEDIR##/dev/}" + ;; + /mnt/*) + MYHOMEDEVICE="${HOMEDIR##/mnt/}" + MYHOMEDEVICE="/dev/${MYHOMEDEVICE%%/*}" + MYHOMEMOUNTPOINT="/mnt/${MYHOMEDEVICE##/dev/}" + MYHOMEDIR="$HOMEDIR" + ;; + [Aa][Uu][Tt][Oo]|[Ss][Cc][Aa][Nn]|[Ff][Ii][Nn][Dd]) + MYHOMEDIR="$(findfile grml.img)" + MYHOMEDEVICE="${MYHOMEDIR##/mnt/}" + MYHOMEDEVICE="/dev/${MYHOMEDEVICE%%/*}" + MYHOMEMOUNTPOINT="/mnt/${MYHOMEDEVICE##/dev/}" ;; - esac - done <&1)" + RC="$?" + fi # -f $MYHOMEDIR + + [ "$RC" = "0" ] && eend 0 || ( eerror "${ERROR}" ; eend 1 ) + + fi # mount -o remount,rw,... + break + ;; + esac # case "$mountpoint" in *$MYHOMEMOUNTPOINT*) + done < Sun, 15 Apr 2007 12:12:33 +0200 + grml-autoconfig (0.6.33) unstable; urgency=low * Do not execute unicode_start on grml-small in live-mode. -- 2.1.4 From 178c24e28b6c2e3e812c249c02fdae1c6c7394c2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 15 Apr 2007 12:15:57 +0200 Subject: [PATCH 14/16] Bump Standard Version to 3.7.2 (no further changes). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b918c2..68b2909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ grml-autoconfig (0.6.34) unstable; urgency=low * Code rewrite of config_fstab(), this should fix the '/home is unmounted on hd-installation if fstype is not auto'. + * Bump Standard Version to 3.7.2 (no further changes). -- Michael Prokop Sun, 15 Apr 2007 12:12:33 +0200 diff --git a/debian/control b/debian/control index d63b7b2..68b7b41 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: optional Maintainer: Michael Prokop Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 S-X-Vcs-Hg: http://hg.grml.org/grml-autoconfig Package: grml-autoconfig -- 2.1.4 From aa3273c6fd0d55a28a8ddae6c080cd16a5bce6ca Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 15 Apr 2007 12:17:21 +0200 Subject: [PATCH 15/16] Add #DEBHELPER# to maintainer scripts. --- debian/changelog | 1 + debian/postinst | 2 ++ debian/postrm | 2 ++ 3 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 68b2909..d84dd89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ grml-autoconfig (0.6.34) unstable; urgency=low * Code rewrite of config_fstab(), this should fix the '/home is unmounted on hd-installation if fstype is not auto'. * Bump Standard Version to 3.7.2 (no further changes). + * Add '#DEBHELPER#' to maintainer scripts. -- Michael Prokop Sun, 15 Apr 2007 12:12:33 +0200 diff --git a/debian/postinst b/debian/postinst index 2e94284..2c1041c 100755 --- a/debian/postinst +++ b/debian/postinst @@ -38,4 +38,6 @@ update-rc.d ${INITSCRIPT}.last start 99 2 . >/dev/null fi +#DEBHELPER# + exit 0 diff --git a/debian/postrm b/debian/postrm index 099e6c0..c61a0d7 100755 --- a/debian/postrm +++ b/debian/postrm @@ -16,4 +16,6 @@ if [ "$1" = "purge" ]; then fi fi +#DEBHELPER# + exit 0 -- 2.1.4 From 4773a7af4eb532279a207e2934a4ef11f0b1726d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 15 Apr 2007 12:20:41 +0200 Subject: [PATCH 16/16] Move error output of unicode_start to $DEBUG. --- autoconfig.functions | 4 ++-- debian/changelog | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index ae4edd7..81edf60 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Apr 13 12:49:52 CEST 2007 [mika] +# Latest change: Son Apr 15 12:20:14 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -277,7 +277,7 @@ config_language(){ ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0 else einfo "Setting up unicode environment." - unicode_start ; eend $? + unicode_start 2>>$DEBUG ; eend $? fi fi fi diff --git a/debian/changelog b/debian/changelog index d84dd89..fbdab89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ grml-autoconfig (0.6.34) unstable; urgency=low * Code rewrite of config_fstab(), this should fix the '/home is unmounted on hd-installation if fstype is not auto'. * Bump Standard Version to 3.7.2 (no further changes). - * Add '#DEBHELPER#' to maintainer scripts. + * Add '#DEBHELPER#' to maintainer scripts. Make lintian happy. + * Move error output of unicode_start to $DEBUG. -- Michael Prokop Sun, 15 Apr 2007 12:12:33 +0200 -- 2.1.4