[Debian-live-changes] r1846 - in dists/trunk/live-sysvinit: . debian scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-28 13:26:43 +0000 (Mon, 28 May 2007)
New Revision: 1846

Modified:
   dists/trunk/live-sysvinit/Makefile
   dists/trunk/live-sysvinit/debian/rules
   dists/trunk/live-sysvinit/scripts/apt-upgrade
Log:


Modified: dists/trunk/live-sysvinit/Makefile
===================================================================
--- dists/trunk/live-sysvinit/Makefile	2007-05-28 13:14:50 UTC (rev 1845)
+++ dists/trunk/live-sysvinit/Makefile	2007-05-28 13:26:43 UTC (rev 1846)
@@ -17,7 +17,7 @@
 	# Installing init scripts
 	set -e; for SCRIPT in scripts/*; \
 	do \
-		install -D -m 0755 $$SCRIPT $(DESTDIR)/etc/init.d/live_`basename $$SCRIPT`; \
+		install -D -m 0755 $$SCRIPT $(DESTDIR)/etc/init.d/`basename $$SCRIPT`; \
 	done
 
 	# Installing documentation
@@ -42,7 +42,7 @@
 	# Uninstalling executables
 	for SCRIPT in scripts/*; \
 	do \
-		rm -f $(DESTDIR)/etc/init.d/live_`basename $$SCRIPT`; \
+		rm -f $(DESTDIR)/etc/init.d/`basename $$SCRIPT`; \
 	done
 
 	# Uninstalling documentation

Modified: dists/trunk/live-sysvinit/debian/rules
===================================================================
--- dists/trunk/live-sysvinit/debian/rules	2007-05-28 13:14:50 UTC (rev 1845)
+++ dists/trunk/live-sysvinit/debian/rules	2007-05-28 13:26:43 UTC (rev 1846)
@@ -37,7 +37,7 @@
 	dh_installchangelogs docs/ChangeLog
 	dh_installdocs
 	dh_install
-	dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 .
+	dh_installinit apt-upgrade --no-restart-on-upgrade --no-start -- start 99 2 6 .
 	dh_compress
 	dh_fixperms
 	dh_installdeb

Modified: dists/trunk/live-sysvinit/scripts/apt-upgrade
===================================================================
--- dists/trunk/live-sysvinit/scripts/apt-upgrade	2007-05-28 13:14:50 UTC (rev 1845)
+++ dists/trunk/live-sysvinit/scripts/apt-upgrade	2007-05-28 13:26:43 UTC (rev 1846)
@@ -5,9 +5,13 @@
 grep -qs boot=live /proc/cmdline || exit 0
 grep -qs upgrade /proc/cmdline || exit 0
 
-NOTTY="-q -y -o DPkg::Options::=--force-confdef"
-UPGRADEOPTS="dist-upgrade"
-DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_FRONTEND
+case "${1}" in
+	start)
+		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}
+		apt-get -q=2 update && apt-get ${NOTTY} -u ${UPGRADEOPTS}
+		;;
+esac