Deprecate home bootopion, drop mkpersistenthome.

diff --git a/autoconfig.functions b/autoconfig.functions
index a010368..ef31f1a 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1293,59 +1293,6 @@ fi
 }
 # }}}
 
 }
 # }}}
 

-# {{{ helper functions
-findfile(){
-FOUND=""
-# search all partitions for a file in the root directory
-for i in /mnt/[sh]d[a-z] /mnt/[sh]d[a-z][1-9] /mnt/[sh]d[a-z][1-9]?*; do
-# See if it's already mounted
-  [ -f "$i/$1" ] &&  { echo "$i/$1"; return 0; }
-  if [ -d "$i" ] && mount -r "$i" 2>>$DEBUG; then
-    [ -f "$i/$1" ] && FOUND="$i/$1"
-    umount -l "$i" 2>>$DEBUG
-    [ -n "$FOUND" ] && { echo "$FOUND"; return 0; }
-  fi
-done
-return 2
-}
-
-fstype(){
-case "$(file -s $1)" in
-  *[Ff][Aa][Tt]*|*[Xx]86*) echo "vfat"; return 0;;
-  *[Rr][Ee][Ii][Ss][Ee][Rr]*)  echo "reiserfs"; return 0;;
-  *[Xx][Ff][Ss]*)  echo "xfs"; return 0;;
-  *[Ee][Xx][Tt]3*) echo "ext3"; return 0;;
-  *[Ee][Xx][Tt]2*) echo "ext2"; return 0;;
-  *data*)          echo "invalid"; return 0;;
-  *) echo "auto"; return 0;;
-esac
-}
-
-# Try to mount this filesystem read-only, without or with encryption
-trymount(){
-# Check if already mounted
-case "$(cat /proc/mounts)" in *\ $2\ *) return 0;; esac
-# Apparently, mount-aes DOES autodetect AES loopback files.
-[ -b "$1" ] && { mount -t auto -o ro "$1" "$2" 2>>$DEBUG; RC="$?"; }
-# We need to mount crypto-loop files with initial rw support
-[ -f "$1" ] && { mount -t auto -o loop,rw "$1" "$2" 2>>$DEBUG; RC="$?"; }
-# Mount succeeded?
-[ "$RC" = "0" ] && return 0
-echo ""
-einfo "Filesystem not autodetected, trying to mount $1 with AES256 encryption."
-a="y"
-while [ "$a" != "n" -a "$a" != "N" ]; do
-# We need to mount crypto-loop files with initial rw support
- mount -t auto -o loop,rw,encryption=AES256 "$1" "$2" && return 0
- echo -n "${RED}Mount failed, retry? [Y/n] ${NORMAL}"
- # Problem with ioctl() from getpasswd()?
- # read a
- read a
-done
-return 1
-}
-# }}}
-

 # {{{ CPU-detection
 config_cpu(){
 if checkbootparam 'nocpu'; then
 # {{{ CPU-detection
 config_cpu(){
 if checkbootparam 'nocpu'; then


@@ -1570,84 +1517,8 @@ fi
 # {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file.
 config_homedir(){
 if checkbootparam 'home' ; then
 # {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file.
 config_homedir(){
 if checkbootparam 'home' ; then

-   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/}"
-      ;;
-      *)
-        eerror "Invalid home= option '$HOMEDIR' specified (must start with /dev/ or /mnt/ or 'scan')." ; eend 1
-        eerror "Option ignored." ; eend 1
-      ;;
-      esac
-   fi # -n $HOMEDIR
-
-   if [ -n "$MYHOMEDIR" ]; then
-      if trymount "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"; then
-         [ -f "$MYHOMEMOUNTPOINT/grml.img" ] && MYHOMEDIR="$MYHOMEMOUNTPOINT/grml.img"
-         while read device mountpoint fs relax; do
-           case "$mountpoint" in *$MYHOMEMOUNTPOINT*)
-             case "$fs" in
-               *[Nn][Tt][Ff][Ss]*)
-                 umount "$MYHOMEMOUNTPOINT"; eerror "Error: will not mount NTFS filesystem on $MYHOMEDEVICE read/write!" ; eend 1
-                 break
-                 ;;
-               *[Ff][Aa][Tt]*)
-                 # Note: This currently won't work with encrypted partitions
-                 umount "$MYHOMEMOUNTPOINT"; mount -t vfat -o rw,uid=grml,gid=grml,umask=002 "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"
-                 if [ ! -f "$MYHOMEDIR" ]; then
-                    ewarn "WARNING: FAT32 is not a good filesystem option for /home/grml (missing socket/symlink support)."
-                    ewarn "WARNING: Better use an ext2 loopback file on this device, and boot with home=$MYHOMEDEVICE/grml.img."
-                 fi
-                 ;;
-             esac
-
-             if mount -o remount,rw "$MYHOMEMOUNTPOINT"; then
-                einfo "Mounting ${WHITE}$MYHOMEDIR${NORMAL} as ${WHITE}/home/grml${NORMAL}."
-                if [ -f "$MYHOMEDIR" ]; then
-                   # It's a loopback file, mount it over the /home/grml directory
-                   trymount "$MYHOMEDIR" /home/grml
-                   RC="$?"
-                   [ "$RC" = "0" ] && ERROR="$(mount -o remount,rw /home/grml 2>&1)"
-                   RC="$?"
-                else
-                   # Do a --bind mount
-                   ERROR="$(mount --bind "$MYHOMEDIR" /home/grml 2>&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 <<EOT
-         $(cat /proc/mounts)
-EOT
-     fi # if trymount ...
-   fi # -n $MYHOMEDIR
-fi # checkbootparam home
+   ewarn "The \"home\" bootoption is deprecated, please use the persistency feature instead."; eend 1
+fi

 }
 # }}}
 
 }
 # }}}
 

diff --git a/bin/mkpersistenthome b/bin/mkpersistenthome
deleted file mode 100755 (executable)
index 848a4e4..0000000
--- a/bin/mkpersistenthome
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-# Filename:      mkpersistenthome
-# Purpose:       mkpersistenthome - create grml home directory image
-# Authors:       grml-team (grml.org), (c) Klaus Knopper Feb 2003, (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-# Latest change: Fre Mär 16 19:59:53 CET 2007 [mika]
-################################################################################
-
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-
-if [ "`id -u`" != "0" ] ; then
-   exec sudo "$0" "$@"
-else
-   export HOME='/home/grml'
-fi
-
-TMP=$(mktemp)
-DIRECTORY=$(mktemp -d /mnt/XXXXXX)
-DIALOG="dialog"
-
-bailout(){
-  [ -n "$DIRECTORY" ] && umount "$DIRECTORY" 2>/dev/null
-  [ -d "$DIRECTORY" ] && rmdir "$DIRECTORY"
-  rm -f "$TMP" "$TMP.done" "$TMP.err"
-  exit 0
-}
-
-trap bailout 1 2 3 15
-
-HOMEKB="$(du -sk $HOME 2>/dev/null | awk '{print $1}')"
-
-# Language-dependent messages
-case "$LANGUAGE" in
-de*|at*|ch*)
-TITLE1="Permanentes grml Heimverzeichnis anlegen"
-MESSAGE1="Dieses Skript richtet ein permanentes Heimverzeichnis für den User \"grml\" auf Ihrer Festplatte oder einem Wechselmedium wie Memorystick, Compactflash oder ZIP-Medium ein. Dadurch ist es möglich, Daten und persönliche Konfigurationen über einen Reboot hinaus zu speichern, sofern sie im persönlichen Heimverzeichnis des Benutzers abgelegt werden. Per Bootoption, z.B. \"home=/dev/sda1\" für die erste Partition einer SCSI-Festplatte oder eines USB-Memorystick, können Sie beim Systemstart das permanente Heimverzeichnis wieder aktivieren. Die Bootoption \"home=scan\" durchsucht automatisch alle Partitionen und erkannten Speichermedien nach einem persistenten grml-Heimverzeichnis.
-
-Möchten Sie das Heimverzeichnis des Benutzers \"grml\" permanent speichern?"
-MESSAGE2="Bitte wählen Sie die Partition, auf der Sie das Heimverzeichnis (oder ein Image davon) anlegen möchten."
-MESSAGE3="Möchten Sie die KOMPLETTE Partition verwenden und mit den Linux-Dateisystem formatieren?
-
-NEIN=Image-Datei auf bestehendem Dateisystem anlegen."
-SUCCESS="FERTIG!
-
-Die grml-Konfiguration wurde erfolgreich gespeichert. Ihre Konfigurationsdateien werden beim nächsten grml-Bootvorgang in die Ramdisk restauriert, wenn Sie im Bootscreen \"grml floppyconfig\" (Diskette) bzw. \"grml myconfig=/mnt/verzeichnisname\" angeben."
-ERROR="Leider konnte die grml-Konfiguration NICHT gespeichert werden:"
-MESSAGE_NO_PARTS="Keine passende Partition gefunden. Zur Erinnerung: NTFS-Partitonen können mit Linux nicht beschrieben werden."
-;;
-*)
-TITLE1="Create persistent grml home directory"
-MESSAGE1="This script creates a persistent home directory for the \"grml\" account on your harddisk or on a changeable medium like memory stick, compact flash or zip media. Using this features makes it possible to store personal data and config files permanently over a reboot, if they are stored inside the home directory of the \"grml\" user. The boot option \"home=/dev/sda1\", for the first partition of a SCSI harddisk or USB memory stick as example, activates the persistent home directory at system startup. You can also let grml scan all autodetected storage devices using the boot option \"home=scan\".
-
-Do you want to create a persistent home directory for the \"grml\" user?"
-
-MESSAGE2="Please select partition for creating persistent homedir (or image):"
-MESSAGE3="Do you want to use the ENTIRE Partition, and would like to format it with the Linux filesystem?
-
-NO=Just create an image in the existing filesystem."
-SUCCESS="SUCCESS!
-
-Creation of grml configuration floppy was successful. Your configuration files will be reinstalled to the ramdisk on next grml boot if you specify \"grml floppyconf\" (floppy disk), or \"grml myconfig=/mnt/directoryname\" at the boot prompt."
-ERROR="The grml configuration could NOT be saved:"
-MESSAGE_NO_PARTS="No suitable partitions could be found. Remember that NTFS-Partitions are not writable with linux."
-;;
-esac
-
-$DIALOG --cr-wrap --clear --title "$TITLE1" --yesno "$MESSAGE1" 18 75 || bailout
-
-# Partition selector
-PARTITIONS=""
-count=0
-for i in `fdisk -l | grep -v NTFS | awk '/^\/dev\// { print $1 }'` ; do
-  PARTITIONS="$PARTITIONS ${i} [Disk/Partition] off"
-  echo "PARTITIONS=$PARTITIONS ${i} [Disk/Partition] off" >> /tmp/part
-done
-[ -z "$PARTITIONS" ] && { $DIALOG --cr-wrap --clear --title "$TITLE1" --msgbox "$ERROR $MESSAGE_NO_PARTS" 10 75; bailout; }
-
-PARTITION=""
-while [ -z "$PARTITION" -o -z "$DIRECTORY" -o ! -e "$DIRECTORY" ]; do
-  rm -f "$TMP"
-  $DIALOG --cr-wrap --clear --title "$TITLE1" --radiolist "$MESSAGE2" 18 75 9 $PARTITIONS 2>"$TMP" || bailout
-  PARTITION="$(<$TMP)"
-done
-
-DEVICE=""
-if $DIALOG --cr-wrap --clear --title "$TITLE1" --defaultno --yesno "$MESSAGE3" 15 75; then
-  DEVICE="$PARTITION"
-  FILEINFO="$PARTITION"
-else
-  FILEINFO="grml.img on $PARTITION"
-  DEVICE="$DIRECTORY/grml.img"
-  mount | grep -q "$DIRECTORY" || mount -r $PARTITION "$DIRECTORY" 2>"$TMP.err"
-  [ "$?" != "0" ] && { $DIALOG --cr-wrap --title "$TITLE1" --msgbox "$ERROR `cat $TMP.err`" 10 75; bailout; }
-  mount | grep -q "$DIRECTORY.*ntfs" && { $DIALOG --cr-wrap --title "$TITLE1" --msgbox "$ERROR NTFS" 10 75; bailout; }
-  mount -o remount,rw $PARTITION "$DIRECTORY"
-fi
-
-# More language-dependent messages
-case "$LANGUAGE" in
- de*|at*|ch*)
-  MESSAGE4="Sind Sie ABSOLUT SICHER, dass Sie die Partition $PARTITION formatieren möchten? ALLE DATEN WERDEN DADURCH GELÖSCHT!"
-  MESSAGE5="Möchten Sie Ihr Heimverzeichnis mit AES256 (=Advanced Encryption Standard 256bit, s.a. http://csrc.nist.gov/encryption/aes/) verschlüsselt speichern? Hierzu ist die Eingabe eines sehr langen Passwortes beim Einrichten sowie beim Einbinden des Verzeichnisses beim Systemstart erforderlich. NEIN=unverschlüsselt"
-  MESSAGE6="Bitte geben Sie die gewünschte Größe Ihres persistenten Heimverzeichnisses in MB an (aktuell belegt: $HOMEKB Kilobyte, verfügbar:"
-  MESSAGE7="Formatiere $FILEINFO mit dem ext2 Dateisystem und kopiere Daten..."
-  MESSAGE8="Lege Datenbereich für Linux an..."
-  SUCCESS="$FILEINFO wurde erfolgreich mit dem Linux ext2 Dateisystem formatiert, und Ihre Heimverzeichnis-Daten wurden darauf transferiert.
-
-Sie können jetzt Ihren Computer neu starten, und beim grml boot:-Prompt durch Eingabe von \"grml home=$PARTITION\" oder \"grml home=scan\" Ihr permanentes Heimverzeichnis aktivieren. Falls Sie außerdem (mit dem save-config Skript) die Systemeinstellungen gesichert haben, können Sie diese Option mit der Angabe von \"myconf=$PARTITION\" kombinieren."
- ;;
- *)
-  MESSAGE4="Are you positively SURE that you want to format partition $PARTITION? ALL DATA WILL BE LOST!"
-  MESSAGE5="Do you want to save your home directory encrypted with AES256 (Advanced Encryption Standard, see http://csrc.nist.gov/encryption/aes/)? If yes, you will have to specify a very long password at homedir creation and boot time."
-  MESSAGE6="Please enter the desired size of your persistent homedir in MB (currently used: $HOMEKB kB, available:"
-  MESSAGE7="Formatting $FILEINFO with ext2 filesystem and copying data..."
-  MESSAGE8="Preparing for Linux filesystem..."
-  SUCCESS="$FILEINFO has been succeessfully formatted with the Linux ext2 filesystem, and your home directory has been transferred to it.
-
-You may now reboot your computer and type \"grml home=$PARTITION\" or \"grml home=scan\" at the grml boot: prompt to take advantage of your new persistent home directory. If you have also saved the system configuration (using the save-config script), you can use this in combination with \"myconf=$PARTITION\"."
- ;;
-esac
-
-gauge(){
-  rm -f "$TMP.done"
-  status=0
-  while [ ! -e "$TMP.done" ]; do
-    echo "$status" ; status="`expr \( 100 - $status \) / 4 + $status`"; sleep 2;
-  done | $DIALOG --title "$TITLE1" --gauge "$1" 8 75 0
-}
-
-# Stop status bar
-killgauge(){
-  touch "$TMP.done" ; wait ; rm -f "$TMP.done"
-}
-
-if [ "$DEVICE" = "$PARTITION" ]; then
-  $DIALOG --cr-wrap --clear --title "$TITLE1" --defaultno --yesno "$MESSAGE4" 6 75 || bailout
-else
-  AMOUNT=0
-  AVAIL="$(df -m $DIRECTORY/. | awk '/^\/dev\//{print $4}')"
-
-  until [ "$AMOUNT" -ge 1 -a "$AMOUNT" -le "$AVAIL" ] 2>/dev/null; do
-    $DIALOG --cr-wrap --clear --title "$TITLE1" --inputbox "$MESSAGE6 $AVAIL MB)" 10 62 "30" 2>"$TMP" || bailout
-    AMOUNT="$(<$TMP)"
-  done
-
-  gauge "$MESSAGE8" &
-  dd if=/dev/urandom of="$DEVICE" bs=1M count="$AMOUNT" >/dev/null || { killgauge; sleep 2; bailout; }
-  killgauge
-fi
-
-# Normal loopback file or partition
-gauge "$MESSAGE7" &
-umount "$DEVICE" 2>/dev/null
-
-# create filesystem
-mke2fs -F -m0 "$DEVICE" >/dev/null 2>"$TMP.err" || { killgauge; $DIALOG --cr-wrap --title "$TITLE1" --msgbox "$ERROR `cat $TMP.err`" 10 75; bailout; }
-
-# mount for synch
-LOOPOPT=""
-[ -f "$DEVICE" ] && LOOPOPT="-o loop"
-mkdir -p /tmp/grmlhome
-mount -t ext2 $LOOPOPT "$DEVICE" /tmp/grmlhome 2>"$TMP.err" && rsync -Ha "$HOME/" /tmp/grmlhome 2>"$TMP.err" || { killgauge; umount /tmp/grmlhome 2>/dev/null; $DIALOG --cr-wrap --title "$TITLE1" --msgbox "$ERROR `cat $TMP.err`" 10 75; bailout; }
-
-umount /tmp/grmlhome
-umount "$DIRECTORY" 2>/dev/null
-killgauge
-
-$DIALOG --cr-wrap --title "$TITLE1" --msgbox "$SUCCESS" 17 65
-
-bailout
-
-## END OF FILE #################################################################

diff --git a/debian/changelog b/debian/changelog
index 772785d..813a652 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ grml-autoconfig (0.9.6) unstable; urgency=low
 
   * Use Lat15-Terminus16 instead of lat1-16/lat10-16 to address
     broken lang=pt feature. [Closes: issue691]
 
   * Use Lat15-Terminus16 instead of lat1-16/lat10-16 to address
     broken lang=pt feature. [Closes: issue691]

+  * Deprecate home=... bootoption and drop the mkpersistenthome
+    script. The home feature has too many flaws and nowadays
+    the persistency feature should be used instead.
+    [Closes: issue449]
+  * Bump to Standards-Version 3.8.4.

 
 

- -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 21:36:39 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 21:49:00 +0100

 
 grml-autoconfig (0.9.5) unstable; urgency=low
 
 
 grml-autoconfig (0.9.5) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 6454eae..a864aa7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: grml
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)

-Standards-Version: 3.8.3
+Standards-Version: 3.8.4

 Build-Depends-Indep: asciidoc, docbook-xsl, xsltproc, shunit2
 Homepage: http://git.grml.org/?p=grml-autoconfig.git
 Vcs-git: git://git.grml.org/grml-autoconfig.git
 Build-Depends-Indep: asciidoc, docbook-xsl, xsltproc, shunit2
 Homepage: http://git.grml.org/?p=grml-autoconfig.git
 Vcs-git: git://git.grml.org/grml-autoconfig.git


@@ -15,7 +15,7 @@ Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig
 Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, console-tools, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
 Recommends: acpi-support, hwinfo, alsa-utils, mdadm, powernowd, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)
 Replaces: grml-saveconfig
 Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, console-tools, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
 Recommends: acpi-support, hwinfo, alsa-utils, mdadm, powernowd, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)

-Description: main bootup process of a grml system
+Description: main bootup process of a Grml (based) system

  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and
  several configuration options.
  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and
  several configuration options.


@@ -25,6 +25,6 @@ Description: main bootup process of a grml system
  the framework.
  .
  This package provides utilities and documentation for saving
  the framework.
  .
  This package provides utilities and documentation for saving

- and restoring configurations on grml system (like save-config,
- restore-config and mkpersistenthome). Please check out the
- provided documentation for further details.
+ and restoring configurations on Grml system (like save-config
+ and restore-config). Please check out the provided
+ documentation for further details.

diff --git a/debian/rules b/debian/rules
index 82bbdbe..f8d767d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ install: build
        install -m 755 sbin/grml-autoconfig debian/grml-autoconfig/usr/sbin/grml-autoconfig
        install -m 755 grml-bootsplash      debian/grml-autoconfig/usr/bin/grml-bootsplash
 
        install -m 755 sbin/grml-autoconfig debian/grml-autoconfig/usr/sbin/grml-autoconfig
        install -m 755 grml-bootsplash      debian/grml-autoconfig/usr/bin/grml-bootsplash
 

-       install -m 755 bin/mkpersistenthome debian/grml-autoconfig/usr/bin/mkpersistenthome

        install -m 755 bin/restore-config debian/grml-autoconfig/usr/bin/restore-config
        install -m 755 bin/save-config debian/grml-autoconfig/usr/bin/save-config
        install -m 755 lib/pump-runparts debian/grml-autoconfig/usr/lib/grml-autoconfig/pump-runparts
        install -m 755 bin/restore-config debian/grml-autoconfig/usr/bin/restore-config
        install -m 755 bin/save-config debian/grml-autoconfig/usr/bin/save-config
        install -m 755 lib/pump-runparts debian/grml-autoconfig/usr/lib/grml-autoconfig/pump-runparts


@@ -59,10 +58,10 @@ binary-indep: build install
        dh_testroot
        dh_installchangelogs
        dh_installdocs doc/grml-autoconfig.1.html doc/grml-autoconfig.8.html \
        dh_testroot
        dh_installchangelogs
        dh_installdocs doc/grml-autoconfig.1.html doc/grml-autoconfig.8.html \

-                       doc/grml-bootsplash.1.html doc/mkpersistenthome.1.html \
+                       doc/grml-bootsplash.1.html \

                        doc/restore-config.1.html doc/save-config.1.html
        dh_installman doc/grml-autoconfig.1.gz doc/grml-autoconfig.8.gz \
                        doc/restore-config.1.html doc/save-config.1.html
        dh_installman doc/grml-autoconfig.1.gz doc/grml-autoconfig.8.gz \

-                       doc/grml-bootsplash.1.gz doc/mkpersistenthome.1.gz \
+                       doc/grml-bootsplash.1.gz \

                        doc/restore-config.1.gz doc/save-config.1.gz
        # backward compability:
        dh_link /usr/share/doc/grml-autoconfig/grml-autoconfig.1.html /usr/share/doc/grml-saveconfig/grml-config.html
                        doc/restore-config.1.gz doc/save-config.1.gz
        # backward compability:
        dh_link /usr/share/doc/grml-autoconfig/grml-autoconfig.1.html /usr/share/doc/grml-saveconfig/grml-config.html

diff --git a/doc/Makefile b/doc/Makefile
index 3075fcb..135fb86 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -9,7 +9,7 @@
        sed -i 's/\.sp//' `echo $^ | sed -e 's/.txt//'`
        gzip -f --best `echo $^ |sed -e 's/.txt//'`
 
        sed -i 's/\.sp//' `echo $^ | sed -e 's/.txt//'`
        gzip -f --best `echo $^ |sed -e 's/.txt//'`
 

-MANPAGES = grml-autoconfig.1 grml-autoconfig.8 grml-bootsplash.1 mkpersistenthome.1 restore-config.1 save-config.1
+MANPAGES = grml-autoconfig.1 grml-autoconfig.8 grml-bootsplash.1 restore-config.1 save-config.1

 
 all: doc
 
 
 all: doc
 

diff --git a/doc/grml-autoconfig.1.txt b/doc/grml-autoconfig.1.txt
index e042f23..34b32f0 100644 (file)
--- a/doc/grml-autoconfig.1.txt
+++ b/doc/grml-autoconfig.1.txt
@@ -232,35 +232,6 @@ Or you put a grml.iso file on your hard disk (maybe in /boot/grml) or on an USB
 stick, use grub to boot from there and place debs, configuration scripts or Grml
 configuraton archives alongside the .iso.
 
 stick, use grub to boot from there and place debs, configuration scripts or Grml
 configuraton archives alongside the .iso.
 

-Use persistent home directory
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You want to use a persistent home directory which includes all the files located
-in $HOME. Use the script mkpersistenthome to create such a persistent home
-directory. You have the options to either use a specific partition as your home
-directory or add a loopback file named grml.img on the specified partition (the
-default).
-
-TIP: /dev/external in the partition selection of mkpersistenthome is an usb
-device without partitions. /dev/external1 corresponds to the first partition on
-an usb device (usually an usb stick).
-
-After running the script mkpersistenthome you can use the boot parameter home to
-activate the home directory. If you are using the option with the loopback file
-(grml.img) you can boot via:
-
-  grml home=scan
-
-which will scan through the partitions and if a file grml.img is found it will
-be mounted as your $HOME-directory. If you want to use a partition as your home
-directory specify the device as an option. If you want to use /dev/sda2 as your
-$HOME boot via:
-
-  grml home=/dev/sda2
-
-Notice: the files located in /etc/skel will be copied to the partition (but will
-not overwrite any files).
-

 Bugs
 ----
 If you find a bug please report it. See link:http://grml.org/bugs/ for details
 Bugs
 ----
 If you find a bug please report it. See link:http://grml.org/bugs/ for details


@@ -268,7 +239,7 @@ about how to report bugs.
 
 See also
 --------
 
 See also
 --------

-grml-autoconfig(8), mkpersistenthome(1), restore-config(1), save-config(1)
+grml-autoconfig(8), restore-config(1), save-config(1)

 
 Author
 ------
 
 Author
 ------

diff --git a/doc/grml-autoconfig.8.txt b/doc/grml-autoconfig.8.txt
index 9a582a6..18c854d 100644 (file)
--- a/doc/grml-autoconfig.8.txt
+++ b/doc/grml-autoconfig.8.txt
@@ -88,7 +88,7 @@ about how to report bugs.
 
 See also
 --------
 
 See also
 --------

-grml-autoconfig(1), mkpersistenthome(1), restore-config(1), save-config(1)
+grml-autoconfig(1), restore-config(1), save-config(1)

 
 Author
 ------
 
 Author
 ------

diff --git a/doc/grml-bootsplash.1.txt b/doc/grml-bootsplash.1.txt
index f7f49d0..86ce82a 100644 (file)
--- a/doc/grml-bootsplash.1.txt
+++ b/doc/grml-bootsplash.1.txt
@@ -34,7 +34,7 @@ about how to report bugs.
 
 See also
 --------
 
 See also
 --------

-grml-autoconfig(1), grml-autoconfig(8), mkpersistenthome(1), restore-config(1)
+grml-autoconfig(1), grml-autoconfig(8), restore-config(1)

 
 Authors
 -------
 
 Authors
 -------

diff --git a/doc/mkpersistenthome.1.txt b/doc/mkpersistenthome.1.txt
deleted file mode 100644 (file)
index a9102f7..0000000
--- a/doc/mkpersistenthome.1.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-mkpersistenthome(1)
-===================
-
-Name
-----
-mkpersistenthome - create persistent home directory
-
-Synopsis
---------
-
-mkpersistenthome
-
-About
------
-
-You have a local partition you would like to use as your home-directory?  Just
-use the interactive script called 'mkpersistenthome'. It will either create a
-file named grml.img on the specified partition or create a partition using the
-ext2 filesystem (you can specify the option in a dialog inside the program).
-grml.img is a loopback device which size you can specify manually.  It is
-possible to scan through the partitions to identify the appropriate partition.
-To use a home-directory located on your hard-drive use the appropriate boot
-parameter on bootprompt:
-
-  home=/dev/sda3    =>   use /dev/sda3 as the homepartition
-  home=scan         =>   scan through the available partitions and search for file grml.img
-
-Use persistent home directory
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You want to use a persistent home directory which includes all the files located
-in $HOME. Use the script mkpersistenthome to create such a persistent home
-directory. You have the options to either use a specific partition as your home
-directory or add a loopback file named grml.img on the specified partition (the
-default).
-
-TIP: /dev/external in the partition selection of mkpersistenthome is an usb
-device without partitions. /dev/external1 corresponds to the first partition on
-an usb device (usually an usb stick).
-
-After running the script mkpersistenthome you can use the boot parameter home to
-activate the home directory. If you are using the option with the loopback file
-(grml.img) you can boot via:
-
-  grml home=scan
-
-which will scan through the partitions and if a file grml.img is found it will
-be mounted as your $HOME-directory. If you want to use a partition as your home
-directory specify the device as an option. If you want to use /dev/sda2 as your
-$HOME boot via:
-
-  grml home=/dev/sda2
-
-Notice: the files located in /etc/skel will be copied to the partition (but will
-not overwrite any files).
-
-Bugs
-----
-If you find a bug please report it. See link:http://grml.org/bugs/ for details
-about how to report bugs.
-
-See also
---------
-grml-autoconfig(1), grml-autoconfig(8), restore-config(1), save-config(1)
-
-Author
-------
-(c) 2005++, Michael Prokop <mika@grml.org>

diff --git a/doc/restore-config.1.txt b/doc/restore-config.1.txt
index b984338..66af1d1 100644 (file)
--- a/doc/restore-config.1.txt
+++ b/doc/restore-config.1.txt
@@ -65,7 +65,7 @@ about how to report bugs.
 
 See also
 --------
 
 See also
 --------

-grml-autoconfig(1), grml-autoconfig(8), mkpersistenthome(1), save-config(1)
+grml-autoconfig(1), grml-autoconfig(8), save-config(1)

 
 Author
 ------
 
 Author
 ------

diff --git a/doc/save-config.1.txt b/doc/save-config.1.txt
index 55b7559..c87b0a4 100644 (file)
--- a/doc/save-config.1.txt
+++ b/doc/save-config.1.txt
@@ -94,7 +94,7 @@ about how to report bugs.
 
 See also
 --------
 
 See also
 --------

-grml-autoconfig(1), grml-autoconfig(8), mkpersistenthome(1), restore-config(1)
+grml-autoconfig(1), grml-autoconfig(8), restore-config(1)

 
 Author
 ------
 
 Author
 ------

diff --git a/etc/init.d/grml-autoconfig.strace b/etc/init.d/grml-autoconfig.strace
index 84a5acb..6825727 100755 (executable)
--- a/etc/init.d/grml-autoconfig.strace
+++ b/etc/init.d/grml-autoconfig.strace
@@ -9,8 +9,8 @@
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig

-# Required-Start:
-# Required-Stop:
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs

 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop:
 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop:

diff --git a/grml-autoconfig b/grml-autoconfig
index a1c260e..c50062a 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -9,8 +9,8 @@
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig

-# Required-Start:
-# Required-Stop:
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs

 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop:
 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop: