]> git.madduck.net Git - code/vinst.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

migrate post-boot cleanup to systemd
authormartin f. krafft <madduck@madduck.net>
Thu, 13 Nov 2014 14:29:21 +0000 (15:29 +0100)
committermartin f. krafft <madduck@madduck.net>
Thu, 13 Nov 2014 14:29:21 +0000 (15:29 +0100)
preseed/jessie/commands/late_commands.d/post_boot_cleanup

index f1fd8082ca795f851f7308eb4dc0a3e9f9ec27d3..569cfd8193c9d8bc11b50f7fc6786d8d2e50793c 100755 (executable)
@@ -1,15 +1,46 @@
 #!/bin/sh
 
-SCRIPT=/etc/init.d/post_boot_cleanup
-SYMLINK=/etc/rcS.d/S99post_boot_cleanup
+if [ -f /etc/inittab ]; then
 
-cat >> $SCRIPT <<_eof
-#!/bin/sh
-sed -i -e '/getty.*tty[12]/s/^#//' /etc/inittab
-telinit q
-rm $SCRIPT
-update-rc.d ${SCRIPT##*/} remove
-_eof
-
-chmod 755 $SCRIPT
-update-rc.d ${SCRIPT##*/} start S 99 .
+  SCRIPT=/etc/init.d/post_boot_cleanup
+  SYMLINK=/etc/rcS.d/S99post_boot_cleanup
+
+  cat >> $SCRIPT <<-_eof
+  #!/bin/sh
+  sed -i -e '/getty.*tty[12]/s/^#//' /etc/inittab
+  telinit q
+  update-rc.d ${SCRIPT##*/} remove
+  rm $SCRIPT
+       _eof
+
+  chmod 755 $SCRIPT
+  update-rc.d ${SCRIPT##*/} start S 99 .
+
+else
+
+  SCRIPT=/usr/local/sbin/post_boot_cleanup
+  UNIT=/etc/systemd/system/post_boot_cleanup.service
+
+  cat >> $SCRIPT <<-_eof
+       #!/bin/sh
+       echo "Running post-install cleanup jobs..." >&2
+       touch /itworked
+       rm $SCRIPT $UNIT
+       _eof
+  chmod 755 $SCRIPT
+
+  cat >> $UNIT <<-_eof
+       [Unit]
+       Description=post-install cleanups
+       ConditionFileIsExecutable=$SCRIPT
+       After=multi-user.target
+
+       [Service]
+       Type=idle
+       ExecStart=$SCRIPT
+       TimeoutSec=0
+       RemainAfterExit=yes
+       SysVStartPriority=99
+       _eof
+
+fi