add patch for systemd path fixes

2 files changed, 199 insertions, 1 deletions

diff --git a/inc/env.setup-sqfs-base.sh b/inc/env.setup-sqfs-base.sh
index 8c87c6a..c217437 100755
--- a/inc/env.setup-sqfs-base.sh
+++ b/inc/env.setup-sqfs-base.sh
@@ -12,7 +12,9 @@ if [ ! -f .osib_unpacked ]; then
   touch .osib_unpacked
 fi
 
-rm run
+rm -f run var/cache var/log var/lock var/pcmcia var/run var/spool var/tmp
+
+mkdir -p run var/log/journal
 
 tar xzf ${ROOT_DIR}/share/files/dev.tgz
 
@@ -47,3 +49,10 @@ if [ ! -f .osib_moved_bins ]; then
 fi
 
 ln -sf /usr/lib/systemd/systemd init
+
+if [ ! -f .osib_patched ]; then
+   for p in $(ls -1 ${ROOT_DIR}/share/patches/* | sort); do
+      patch -p1 < $p
+   done
+   touch .osib_patched
+fi
diff --git a/share/patches/01-systemd-diff.patch b/share/patches/01-systemd-diff.patch
new file mode 100644
index 0000000..9598592
--- /dev/null
+++ b/share/patches/01-systemd-diff.patch
@@ -0,0 +1,189 @@
+diff -wur sqfs-base/lib/systemd/system/basic.target.wants/udev-trigger.service sqfs-base.new/lib/systemd/system/basic.target.wants/udev-trigger.service
+--- sqfs-base/lib/systemd/system/basic.target.wants/udev-trigger.service	2012-06-26 11:55:53.000000000 +0200
++++ sqfs-base.new/lib/systemd/system/basic.target.wants/udev-trigger.service	2012-06-26 14:28:51.041281949 +0200
+@@ -7,4 +7,4 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/usr/bin/udevadm trigger --type=subsystems --action=add ; /usr/bin/udevadm trigger --type=devices --action=add
++ExecStart=/openslx/usr/bin/udevadm trigger --type=subsystems --action=add ; /openslx/usr/bin/udevadm trigger --type=devices --action=add
+diff -wur sqfs-base/lib/systemd/system/dbus.service sqfs-base.new/lib/systemd/system/dbus.service
+--- sqfs-base/lib/systemd/system/dbus.service	2012-06-26 11:27:29.000000000 +0200
++++ sqfs-base.new/lib/systemd/system/dbus.service	2012-06-26 14:29:40.721281652 +0200
+@@ -4,8 +4,8 @@
+ After=syslog.target
+ 
+ [Service]
+-ExecStartPre=/usr/bin/dbus-uuidgen --ensure
+-ExecStartPre=-/bin/rm -f /var/run/messagebus.pid
+-ExecStart=/usr/bin/dbus-daemon --system --address=systemd: --nofork --systemd-activation
+-ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
++ExecStartPre=/openslx/usr/bin/dbus-uuidgen --ensure
++ExecStartPre=-/openslx/bin/rm -f /var/run/messagebus.pid
++ExecStart=/openslx/usr/bin/dbus-daemon --system --address=systemd: --nofork --systemd-activation
++ExecReload=/openslx/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+ OOMScoreAdjust=-900
+diff -wur sqfs-base/lib/systemd/system/udev-settle.service sqfs-base.new/lib/systemd/system/udev-settle.service
+--- sqfs-base/lib/systemd/system/udev-settle.service	2012-06-26 11:55:53.000000000 +0200
++++ sqfs-base.new/lib/systemd/system/udev-settle.service	2012-06-26 14:29:57.987948214 +0200
+@@ -19,7 +19,7 @@
+ Type=oneshot
+ TimeoutSec=180
+ RemainAfterExit=yes
+-ExecStart=/usr/bin/udevadm settle
++ExecStart=/openslx/usr/bin/udevadm settle
+ 
+ [Install]
+ WantedBy=basic.target
+diff -wur sqfs-base/lib/systemd/system/udev-trigger.service sqfs-base.new/lib/systemd/system/udev-trigger.service
+--- sqfs-base/lib/systemd/system/udev-trigger.service	2012-06-26 11:55:53.000000000 +0200
++++ sqfs-base.new/lib/systemd/system/udev-trigger.service	2012-06-26 14:28:51.041281949 +0200
+@@ -7,4 +7,4 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/usr/bin/udevadm trigger --type=subsystems --action=add ; /usr/bin/udevadm trigger --type=devices --action=add
++ExecStart=/openslx/usr/bin/udevadm trigger --type=subsystems --action=add ; /openslx/usr/bin/udevadm trigger --type=devices --action=add
+diff -wur sqfs-base/usr/lib/systemd/system/console-shell.service sqfs-base.new/usr/lib/systemd/system/console-shell.service
+--- sqfs-base/usr/lib/systemd/system/console-shell.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/console-shell.service	2012-06-26 14:45:23.777942684 +0200
+@@ -14,7 +14,7 @@
+ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStart=-/openslx/sbin/sulogin
+-ExecStopPost=-/usr/bin/systemctl poweroff
++ExecStopPost=-/openslx/usr/bin/systemctl poweroff
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff -wur sqfs-base/usr/lib/systemd/system/emergency.service sqfs-base.new/usr/lib/systemd/system/emergency.service
+--- sqfs-base/usr/lib/systemd/system/emergency.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/emergency.service	2012-06-26 14:45:37.347942604 +0200
+@@ -17,7 +17,7 @@
+ ExecStartPre=-/openslx/bin/plymouth quit
+ ExecStartPre=-/openslx/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.'
+ ExecStart=-/openslx/sbin/sulogin
+-ExecStopPost=/usr/bin/systemctl --fail --no-block default
++ExecStopPost=/openslx/usr/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff -wur sqfs-base/usr/lib/systemd/system/halt.service sqfs-base.new/usr/lib/systemd/system/halt.service
+--- sqfs-base/usr/lib/systemd/system/halt.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/halt.service	2012-06-26 14:52:19.491273533 +0200
+@@ -13,4 +13,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemctl --force halt
++ExecStart=/openslx/usr/bin/systemctl --force halt
+diff -wur sqfs-base/usr/lib/systemd/system/kexec.service sqfs-base.new/usr/lib/systemd/system/kexec.service
+--- sqfs-base/usr/lib/systemd/system/kexec.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/kexec.service	2012-06-26 14:45:51.857942517 +0200
+@@ -13,4 +13,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemctl --force kexec
++ExecStart=/openslx/usr/bin/systemctl --force kexec
+diff -wur sqfs-base/usr/lib/systemd/system/poweroff.service sqfs-base.new/usr/lib/systemd/system/poweroff.service
+--- sqfs-base/usr/lib/systemd/system/poweroff.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/poweroff.service	2012-06-26 14:46:04.017942443 +0200
+@@ -13,4 +13,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemctl --force poweroff
++ExecStart=/openslx/usr/bin/systemctl --force poweroff
+diff -wur sqfs-base/usr/lib/systemd/system/reboot.service sqfs-base.new/usr/lib/systemd/system/reboot.service
+--- sqfs-base/usr/lib/systemd/system/reboot.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/reboot.service	2012-06-26 14:46:16.594609036 +0200
+@@ -13,4 +13,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemctl --force reboot
++ExecStart=/openslx/usr/bin/systemctl --force reboot
+diff -wur sqfs-base/usr/lib/systemd/system/rescue.service sqfs-base.new/usr/lib/systemd/system/rescue.service
+--- sqfs-base/usr/lib/systemd/system/rescue.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/rescue.service	2012-06-26 14:46:41.107942222 +0200
+@@ -18,7 +18,7 @@
+ ExecStartPre=-/openslx/bin/plymouth quit
+ ExecStartPre=-/openslx/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl" to view system logs. Type "systemctl reboot" to reboot.'
+ ExecStart=-/openslx/sbin/sulogin
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block default
++ExecStopPost=-/openslx/usr/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff -wur sqfs-base/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service sqfs-base.new/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service
+--- sqfs-base/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service	2012-06-26 14:41:34.561277387 +0200
+@@ -20,4 +20,4 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/usr/bin/systemd-tmpfiles --create --remove
++ExecStart=/openslx/usr/bin/systemd-tmpfiles --create --remove
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-ask-password-console.service sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-console.service
+--- sqfs-base/usr/lib/systemd/system/systemd-ask-password-console.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-console.service	2012-06-26 14:47:04.067942086 +0200
+@@ -15,4 +15,4 @@
+ ConditionPathExists=!/run/plymouth/pid
+ 
+ [Service]
+-ExecStart=/usr/bin/systemd-tty-ask-password-agent --watch --console
++ExecStart=/openslx/usr/bin/systemd-tty-ask-password-agent --watch --console
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-ask-password-plymouth.service sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-plymouth.service
+--- sqfs-base/usr/lib/systemd/system/systemd-ask-password-plymouth.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-plymouth.service	2012-06-26 14:47:31.857941918 +0200
+@@ -16,4 +16,4 @@
+ ConditionPathExists=/run/plymouth/pid
+ 
+ [Service]
+-ExecStart=/usr/bin/systemd-tty-ask-password-agent --watch --plymouth
++ExecStart=/openslx/usr/bin/systemd-tty-ask-password-agent --watch --plymouth
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-ask-password-wall.service sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-wall.service
+--- sqfs-base/usr/lib/systemd/system/systemd-ask-password-wall.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-ask-password-wall.service	2012-06-26 14:48:08.371275035 +0200
+@@ -11,6 +11,6 @@
+ After=systemd-user-sessions.service
+ 
+ [Service]
+-ExecStartPre=-/usr/bin/systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service
+-ExecStartPre=-/usr/bin/systemctl stop systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
+-ExecStart=/usr/bin/systemd-tty-ask-password-agent --wall
++ExecStartPre=-/openslx/usr/bin/systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service
++ExecStartPre=-/openslx/usr/bin/systemctl stop systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
++ExecStart=/openslx/usr/bin/systemd-tty-ask-password-agent --wall
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-readahead-done.service sqfs-base.new/usr/lib/systemd/system/systemd-readahead-done.service
+--- sqfs-base/usr/lib/systemd/system/systemd-readahead-done.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-readahead-done.service	2012-06-26 14:51:43.171273752 +0200
+@@ -14,7 +14,7 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemd-notify --readahead=done
++ExecStart=/openslx/usr/bin/systemd-notify --readahead=done
+ 
+ [Install]
+ Also=systemd-readahead-collect.service
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-tmpfiles-clean.service sqfs-base.new/usr/lib/systemd/system/systemd-tmpfiles-clean.service
+--- sqfs-base/usr/lib/systemd/system/systemd-tmpfiles-clean.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-tmpfiles-clean.service	2012-06-26 14:51:58.691273658 +0200
+@@ -19,5 +19,5 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemd-tmpfiles --clean
++ExecStart=/openslx/usr/bin/systemd-tmpfiles --clean
+ IOSchedulingClass=idle
+diff -wur sqfs-base/usr/lib/systemd/system/systemd-tmpfiles-setup.service sqfs-base.new/usr/lib/systemd/system/systemd-tmpfiles-setup.service
+--- sqfs-base/usr/lib/systemd/system/systemd-tmpfiles-setup.service	2012-06-26 14:07:18.000000000 +0200
++++ sqfs-base.new/usr/lib/systemd/system/systemd-tmpfiles-setup.service	2012-06-26 14:41:34.561277387 +0200
+@@ -20,4 +20,4 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=/usr/bin/systemd-tmpfiles --create --remove
++ExecStart=/openslx/usr/bin/systemd-tmpfiles --create --remove