[Debian-live-changes] r1815 - in dists/trunk/live-initramfs: . docs manpages scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-28 07:19:54 +0000 (Mon, 28 May 2007)
New Revision: 1815

Removed:
   dists/trunk/live-initramfs/scripts/live-bottom/42apt_upgrade
Modified:
   dists/trunk/live-initramfs/Makefile
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/manpages/live-initramfs.en.7
Log:


Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile	2007-05-28 07:14:53 UTC (rev 1814)
+++ dists/trunk/live-initramfs/Makefile	2007-05-28 07:19:54 UTC (rev 1815)
@@ -10,7 +10,7 @@
 test:
 	set -e; for SCRIPT in hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
 	do \
-		sh -n $$SCRIPT || exit 1; \
+		sh -n $$SCRIPT; \
 	done
 
 build:

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-28 07:14:53 UTC (rev 1814)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-28 07:19:54 UTC (rev 1815)
@@ -1,3 +1,8 @@
+2007-05-28  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live-bottom/42apt_upgrade:
+	  - Moved to dedicated live-sysvinit package.
+
 2007-05-24  Daniel Baumann  <daniel at debian.org>
 
 	* debian/control:

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-28 07:14:53 UTC (rev 1814)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-28 07:19:54 UTC (rev 1815)
@@ -89,6 +89,8 @@
 .PP
 \fIlive\-helper\fR(7)
 .PP
+\fIlive\-sysvinit\fR(7)
+.PP
 \fIinitramfs\-tools\fR(8)
 
 .SH BUGS

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/42apt_upgrade
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/42apt_upgrade	2007-05-28 07:14:53 UTC (rev 1814)
+++ dists/trunk/live-initramfs/scripts/live-bottom/42apt_upgrade	2007-05-28 07:19:54 UTC (rev 1815)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -z "${UPGRADE}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Enabling apt upgrade..."
-
-# live-initramfs script
-
-cat > /root/etc/init.d/apt-upgrade << EOF
-#!/bin/sh
-
-NOTTY="-q -y -o DPkg::Options::=--force-confdef"
-UPGRADEOPTS="dist-upgrade"
-DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_FRONTEND
-
-apt-get -q=2 update && apt-get \${NOTTY} -u \${UPGRADEOPTS}
-EOF
-
-chmod 0755 /root/etc/init.d/apt-upgrade
-
-chroot /root update-rc.d apt-upgrade defaults 99
-
-log_end_msg