busybox: move systemd to /usr/lib

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-02-20 17:05:22 +01:00
parent f996157161
commit 74d7bcc068
2 changed files with 5 additions and 5 deletions

View File

@ -213,12 +213,12 @@ post_install() {
# cron support # cron support
if [ "$CRON_SUPPORT" = "yes" ] ; then if [ "$CRON_SUPPORT" = "yes" ] ; then
mkdir -p $INSTALL/lib/systemd/system mkdir -p $INSTALL/usr/lib/systemd/system
cp $PKG_DIR/system.d.opt/cron.service $INSTALL/lib/systemd/system cp $PKG_DIR/system.d.opt/cron.service $INSTALL/usr/lib/systemd/system
enable_service cron.service enable_service cron.service
mkdir -p $INSTALL/usr/share/services mkdir -p $INSTALL/usr/share/services
cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
cp $PKG_DIR/system.d.opt/cron-defaults.service $INSTALL/lib/systemd/system cp $PKG_DIR/system.d.opt/cron-defaults.service $INSTALL/usr/lib/systemd/system
enable_service cron-defaults.service enable_service cron-defaults.service
fi fi
} }

View File

@ -570,7 +570,7 @@
mount --move /storage /sysroot/storage mount --move /storage /sysroot/storage
fi fi
[ -f "/sysroot/lib/systemd/systemd" ] || error "final_check" "Could not find system." [ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find system."
} }
if [ "${boot%%=*}" = "FILE" ]; then if [ "${boot%%=*}" = "FILE" ]; then
@ -606,6 +606,6 @@
echo "" > /sysroot/dev/.storage_netboot echo "" > /sysroot/dev/.storage_netboot
fi fi
# switch to new sysroot and start real init # switch to new sysroot and start real init
exec /bin/busybox switch_root /sysroot /lib/systemd/systemd $INIT_ARGS exec /bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS
error "switch_root" "Error in initramfs. Could not switch to new root" error "switch_root" "Error in initramfs. Could not switch to new root"