r2744 - in people/daniel/installer-initramfs/scripts: . installer-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-12 07:35:32 +0000 (Sun, 12 Aug 2007)
New Revision: 2744

Removed:
   people/daniel/installer-initramfs/scripts/installer-bottom/01integrity_check
   people/daniel/installer-initramfs/scripts/installer-bottom/02etc_live_conf
Modified:
   people/daniel/installer-initramfs/scripts/installer
Log:


Modified: people/daniel/installer-initramfs/scripts/installer
===================================================================
--- people/daniel/installer-initramfs/scripts/installer	2007-08-11 17:52:38 UTC (rev 2743)
+++ people/daniel/installer-initramfs/scripts/installer	2007-08-12 07:35:32 UTC (rev 2744)
@@ -2,6 +2,9 @@
 
 # set -e
 
+# Exit if system was not booted by installer-initramfs
+grep -qs boot=installer /proc/cmdline || exit 0
+
 export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 
 echo "/root/lib" >> /etc/ld.so.conf

Deleted: people/daniel/installer-initramfs/scripts/installer-bottom/01integrity_check
===================================================================
--- people/daniel/installer-initramfs/scripts/installer-bottom/01integrity_check	2007-08-11 17:52:38 UTC (rev 2743)
+++ people/daniel/installer-initramfs/scripts/installer-bottom/01integrity_check	2007-08-12 07:35:32 UTC (rev 2744)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs script
-
-grep -qs integrity-check /proc/cmdline || exit 0
-
-cd /live/image
-md5sum -c md5sum.txt < /dev/tty8

Deleted: people/daniel/installer-initramfs/scripts/installer-bottom/02etc_live_conf
===================================================================
--- people/daniel/installer-initramfs/scripts/installer-bottom/02etc_live_conf	2007-08-11 17:52:38 UTC (rev 2743)
+++ people/daniel/installer-initramfs/scripts/installer-bottom/02etc_live_conf	2007-08-12 07:35:32 UTC (rev 2744)
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Copying config on real root fs..."
-
-# live-initramfs script
-
-if [ -f /etc/live.conf ] ; then
-       if [ ! -z "${LIVECONF}" ]; then
-               # Updating live.conf
-               sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
-                   -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
-                   -e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' /etc/live.conf
-       fi
-       cp -p /etc/live.conf /root/etc/live.conf
-
-else
-       cat <<EOF >/root/etc/live.conf
-export USERNAME="$USERNAME"
-export USERFULLNAME="$USERFULLNAME"
-export HOSTNAME="$HOSTNAME"
-EOF
-
-fi
-
-log_end_msg