[issue #25] ajout du point de montage /var/run en tmpfs + nettoyage des fonctions inutiles

config/read-only-fs.sh

@@ -192,70 +192,6 @@ apt-get -y --force-yes install ntp busybox-syslogd; dpkg --purge rsyslog
 
 echo "Configuring system..."
 
-# Install boot-time R/W jumper test if requested
-GPIOTEST="gpio -g mode $RW_PIN up\n\
-if [ \`gpio -g read $RW_PIN\` -eq 0 ] ; then\n\
-\tmount -o remount,rw \/\n\
-\tmount -o remount,rw \/boot\n\
-fi\n"
-if [ $INSTALL_RW_JUMPER -ne 0 ]; then
-	apt-get install -y --force-yes wiringpi
-	# Check if already present in rc.local:
-	grep "gpio -g read" /etc/rc.local >/dev/null
-	if [ $? -eq 0 ]; then
-		# Already there, but make sure pin is correct:
-		sed -i "s/^.*gpio\ -g\ read.*$/$GPIOTEST/g" /etc/rc.local >/dev/null
-
-	else
-		# Not there, insert before final 'exit 0'
-		sed -i "s/^exit 0/$GPIOTEST\\nexit 0/g" /etc/rc.local >/dev/null
-	fi
-fi
-
-# Install watchdog if requested
-if [ $INSTALL_WATCHDOG -ne 0 ]; then
-	apt-get install -y --force-yes watchdog
-	# $MODULE is specific watchdog module name
-	MODULE=${WATCHDOG_MODULES[($WD_TARGET-1)]}
-	# Add to /etc/modules, update watchdog config file
-	append1 /etc/modules $MODULE $MODULE
-	replace /etc/watchdog.conf "#watchdog-device" "watchdog-device"
-	replace /etc/watchdog.conf "#max-load-1" "max-load-1"
-	# Start watchdog at system start and start right away
-	# Raspbian Stretch needs this package installed first
-	apt-get install -y --force-yes insserv
-	insserv watchdog; /etc/init.d/watchdog start
-	# Additional settings needed on Jessie
-	append1 /lib/systemd/system/watchdog.service "WantedBy" "WantedBy=multi-user.target"
-	systemctl enable watchdog
-	# Set up automatic reboot in sysctl.conf
-	replaceAppend /etc/sysctl.conf "^.*kernel.panic.*$" "kernel.panic = 10"
-fi
-
-# Install gpio-halt if requested
-if [ $INSTALL_HALT -ne 0 ]; then
-	apt-get install -y --force-yes wiringpi
-	echo "Installing gpio-halt in /usr/local/bin..."
-	cd /tmp
-	curl -LO https://github.com/adafruit/Adafruit-GPIO-Halt/archive/master.zip
-	unzip master.zip
-	cd Adafruit-GPIO-Halt-master
-	make
-	mv gpio-halt /usr/local/bin
-	cd ..
-	rm -rf Adafruit-GPIO-Halt-master
-
-	# Add gpio-halt to /rc.local:
-	grep gpio-halt /etc/rc.local >/dev/null
-	if [ $? -eq 0 ]; then
-		# gpio-halt already in rc.local, but make sure correct:
-		sed -i "s/^.*gpio-halt.*$/\/usr\/local\/bin\/gpio-halt $HALT_PIN \&/g" /etc/rc.local >/dev/null
-	else
-		# Insert gpio-halt into rc.local before final 'exit 0'
-		sed -i "s/^exit 0/\/usr\/local\/bin\/gpio-halt $HALT_PIN \&\\nexit 0/g" /etc/rc.local >/dev/null
-	fi
-fi
-
 # Add fastboot, noswap and/or ro to end of /boot/cmdline.txt
 append2 /boot/cmdline.txt fastboot fastboot
 append2 /boot/cmdline.txt noswap noswap
@@ -271,12 +207,6 @@ rm -rf /var/cache/lightdm
 ln -s /tmp /var/lib/lightdm
 ln -s /tmp /var/cache/lightdm
 
-# Make SSH work
-replaceAppend /etc/ssh/sshd_config "^.*UsePrivilegeSeparation.*$" "UsePrivilegeSeparation no"
-# bbro method (not working in Jessie?):
-#rmdir /var/run/sshd
-#ln -s /tmp /var/run/sshd
-
 # Change spool permissions in var.conf (rondie/Margaret fix)
 replace /usr/lib/tmpfiles.d/var.conf "spool\s*0755" "spool 1777"
 
@@ -294,6 +224,7 @@ replace /etc/fstab "vfat\s*defaults\s" "vfat    defaults,ro "
 replace /etc/fstab "ext4\s*defaults,noatime\s" "ext4    defaults,noatime,ro "
 append1 /etc/fstab "/var/log" "tmpfs /var/log tmpfs nodev,nosuid 0 0"
 append1 /etc/fstab "/var/tmp" "tmpfs /var/tmp tmpfs nodev,nosuid 0 0"
+append1 /etc/fstab "/var/run" "tmpfs /var/run tmpfs nodev,nosuid 0 0"
 append1 /etc/fstab "\s/tmp"   "tmpfs /tmp    tmpfs nodev,nosuid 0 0"
 
 # PROMPT FOR REBOOT --------------------------------------------------------