[Piuparts-commits] rev 823 - piatti/org/piuparts.debian.org/etc/scripts

[Holger Levsen]

Author: holger
Date: 2010-11-27 22:18:26 +0000 (Sat, 27 Nov 2010)
New Revision: 823

Modified:
   piatti/org/piuparts.debian.org/etc/scripts/post_purge_exceptions
   piatti/org/piuparts.debian.org/etc/scripts/pre_install_exceptions
Log:
revert changes. one can put 'force-yes' in apt.conf, but not 'Yes, do as I say'... see #605127

Modified: piatti/org/piuparts.debian.org/etc/scripts/post_purge_exceptions
===================================================================
--- piatti/org/piuparts.debian.org/etc/scripts/post_purge_exceptions	2010-11-27 21:39:29 UTC (rev 822)
+++ piatti/org/piuparts.debian.org/etc/scripts/post_purge_exceptions	2010-11-27 22:18:26 UTC (rev 823)
@@ -32,14 +32,16 @@
 				;;
 	upstart)		log_debug
 				#  removal wont work if sysvinit isn't reinstalled
-				#apt-get -y install sysvinit
-				#apt-get clean
+				apt-get -y install sysvinit
+				apt-get clean
 				;;
 	file-rc)		log_debug
 				# removal wont work if sysv-rc isn't reinstalled
-				#yes 'Yes, do as I say!' | apt-get -y --force-yes install sysv-rc
-				#dpkg --purge file-rc
-				#apt-get clean
+				yes 'Yes, do as I say!' | apt-get -y --force-yes install sysv-rc
+				dpkg --purge file-rc
+				echo "Debug: this files don't exist when sysv-rc is installed by debootstrap, they are just created when sysv-rc is installed later. See #605127."
+				rm -fv /var/lib/update-rc.d/*
+				apt-get clean
 				;;
 esac
 

Modified: piatti/org/piuparts.debian.org/etc/scripts/pre_install_exceptions
===================================================================
--- piatti/org/piuparts.debian.org/etc/scripts/pre_install_exceptions	2010-11-27 21:39:29 UTC (rev 822)
+++ piatti/org/piuparts.debian.org/etc/scripts/pre_install_exceptions	2010-11-27 22:18:26 UTC (rev 823)
@@ -37,13 +37,11 @@
 				;;
 	upstart)		log_debug
 				# force installation and removal of essential package sysvinit
-				#yes 'Yes, do as I say!' | apt-get -y --force-yes install upstart
-				echo 'APT::Get::force-yes "yes";' >> /etc/apt/apt.conf
+				yes 'Yes, do as I say!' | apt-get -y --force-yes install upstart
 				;;
 	file-rc)		log_debug
 				# force installation and removal of essential package sysv-rc
-				#yes 'Yes, do as I say!' | apt-get -y --force-yes install file-rc
-				echo 'APT::Get::force-yes "yes";' >> /etc/apt/apt.conf
+				yes 'Yes, do as I say!' | apt-get -y --force-yes install file-rc
 				;;
 esac