From e54ae72e08c71669fccc297c9500e1d8e83447ca Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 16 Apr 2007 19:34:29 +0200 Subject: [PATCH] Support full automatic installation of Debian via grml-debootstrap --- autoconfig | 3 +- autoconfig.functions | 139 +++++++++++++++++++++++++++++++++++++++------------ autoconfig.small | 3 +- debian/changelog | 7 +++ debian/control | 2 +- grml-autoconfig | 4 +- 6 files changed, 123 insertions(+), 35 deletions(-) diff --git a/autoconfig b/autoconfig index 45f3d0d..fd02c67 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: Mit Apr 04 21:33:40 CEST 2007 [mika] +# Latest change: Mon Apr 16 19:33:47 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -59,6 +59,7 @@ CONFIG_CDROM_PERM='yes' # for burning on IDE-CD-Roms, k3b (and others) che CONFIG_CDROM_SCRIPTS='yes' # run scripts from /cdrom/scripts CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories +CONFIG_DEBOOTSTRAP='yes' # support automatic installation of Debian via grml-deboostrap 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 diff --git a/autoconfig.functions b/autoconfig.functions index cf78d9d..7960772 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 Apr 15 12:20:14 CEST 2007 [mika] +# Latest change: Mon Apr 16 19:32:25 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -1065,7 +1065,7 @@ if [ -z "$INSTALLED" ] ; then *) continue ;; # *) NONEFOUND='1'; continue ;; esac - + # use a swapfile if [ -z "$NOSWAP" ] ; then mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue @@ -1083,7 +1083,7 @@ if [ -z "$INSTALLED" ] ; then 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 @@ -1098,10 +1098,10 @@ if [ -z "$INSTALLED" ] ; then fi fi eend 0 - + # Umount, if not in use [ -n "$MOUNTED" ] && umount -r $m 2>/dev/null - + done <|/usr/bin/grml2hd_noninteractive<|/usr/bin/grml2hd_noninteractive<|/usr/bin/grml-debootstrap_noninteractive< # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mit Apr 04 21:33:42 CEST 2007 [mika] +# Latest change: Mon Apr 16 19:33:45 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -59,6 +59,7 @@ CONFIG_CDROM_PERM='yes' # for burning on IDE-CD-Roms, k3b (and others) che CONFIG_CDROM_SCRIPTS='yes' # run scripts from /cdrom/scripts CONFIG_CONSOLE='yes' # activate mgetty when using console=... as bootparam CONFIG_CREATE_MNT_DIRS='no' # create /mnt-directories +CONFIG_DEBOOTSTRAP='yes' # support automatic installation of Debian via grml-deboostrap 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 diff --git a/debian/changelog b/debian/changelog index 494a018..7113af1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-autoconfig (0.6.37) unstable; urgency=low + + * Support full automatic installation of Debian via grml-debootstrap + via config_debootstrap(). + + -- Michael Prokop Mon, 16 Apr 2007 19:27:13 +0200 + grml-autoconfig (0.6.36) unstable; urgency=low * Fix tty6-check, thanks for the code review - Matthias Lederhofer! diff --git a/debian/control b/debian/control index 68b7b41..872f48d 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Package: grml-autoconfig Architecture: all Conflicts: grml-etc (<= 0.4-7) Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync -Recommends: hwinfo, alsa-utils, mdadm, powernowd, aumix, locales +Recommends: hwinfo, alsa-utils, mdadm, powernowd, aumix, locales, grml2hd, grml-debootstrap (>= 0.8) Description: main bootup process of a grml system grml-autoconfig is the main part of the bootup process of the grml system. This includes the hardware recognition system. diff --git a/grml-autoconfig b/grml-autoconfig index 433a8e0..c59dcc3 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: Mit Apr 04 21:34:05 CEST 2007 [mika] +# Latest change: Mon Apr 16 19:34:17 CEST 2007 [mika] ################################################################################ # http://wiki.debian.org/LSBInitScripts => @@ -260,6 +260,8 @@ checkvalue $CONFIG_BLANKING && config_blanking checkvalue $CONFIG_GRML2HD && config_grml2hd +checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap + checkvalue $CONFIG_XSTARTUP && config_x_startup # }}} -- 2.1.4