summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xdata/stage3.1/init6
-rwxr-xr-xremote/setup-tools.sh1
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index eb7499e5..09d79f16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*~
server/stage3.1
stage3.2
+initramfs
src
build
.built
diff --git a/data/stage3.1/init b/data/stage3.1/init
index 53420983..d25d205d 100755
--- a/data/stage3.1/init
+++ b/data/stage3.1/init
@@ -21,8 +21,6 @@ mount -n -t tmpfs -o 'mode=755' run "/run"
[ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys
#modprobe -a squashfs aufs 2>/dev/null
-#insmod /lib/modules/3.2.0-24-generic-pae/kernel/fs/squashfs/squashfs.ko
-#insmod /lib/modules/3.2.0-24-generic-pae/kernel/ubuntu/aufs/aufs.ko
mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
mount -n /mnt/openslx.sqfs /rorootfs
@@ -39,7 +37,7 @@ for mnt in proc sys run ; do
umount -n $mnt
done
-/bin/busybox sh
+#/bin/sh
unset BOOT_IMAGE initrd
# new style of pivoting (switch_root or run-init)
-exec /bin/switch_root -c dev/console /mnt /sbin/init
+exec /sbin/switch_root -c dev/console /mnt /usr/lib/systemd/systemd
diff --git a/remote/setup-tools.sh b/remote/setup-tools.sh
index f9867048..a345293d 100755
--- a/remote/setup-tools.sh
+++ b/remote/setup-tools.sh
@@ -122,6 +122,7 @@ main () {
fetch_source
build
copyfileswithdependencies
+ cd $TOOL_DIR
else
echo "Tool directory not found."
fi