From 16fd78edbc1c04eab8cf9ebf49594c3b28fd1b6c Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Wed, 5 Sep 2018 20:16:44 +0200
Subject: moved initscript from scripts/init.rootfs to skeleton/init

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 Makefile            |  6 ++----
 scripts/init.rootfs | 59 -----------------------------------------------------
 skeleton/init       | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 63 deletions(-)
 delete mode 100644 scripts/init.rootfs
 create mode 100755 skeleton/init

diff --git a/Makefile b/Makefile
index f88f458..4853315 100644
--- a/Makefile
+++ b/Makefile
@@ -101,9 +101,9 @@ else
 endif
 	make -C '$(LINUX_BUILD_DIR)' kvmconfig
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' bzImage
-	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_HDR_PATH='$(ROOTFS_DIR)/usr' headers_install
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_MOD_PATH='$(ROOTFS_DIR)/usr' modules
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_MOD_PATH='$(ROOTFS_DIR)/usr' modules_install
+	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_HDR_PATH='$(ROOTFS_DIR)/usr' headers_install
 
 $(MUSL_TARGET):
 	cd '$(MUSL_BUILD_DIR)' && (test -r ./config.mak || ./configure --prefix='$(ROOTFS_DIR)/usr')
@@ -126,9 +126,7 @@ $(BUSYBOX_TARGET):
 
 build: extract $(LINUX_TARGET) $(MUSL_TARGET) $(BUSYBOX_TARGET)
 
-$(INITRD_TARGET):
-	cp -v '$(SCRIPT_DIR)/init.rootfs' '$(ROOTFS_DIR)/init'
-	chmod 0755                        '$(ROOTFS_DIR)/init'
+$(INITRD_TARGET): $(ROOTFS_DIR)/bin/busybox
 	cp -rfvTp '$(SKEL_DIR)'           '$(ROOTFS_DIR)'
 	cd '$(ROOTFS_DIR)' && find . -print0 | cpio --owner 0:0 --null -ov --format=newc | gzip -9 > '$(INITRD_TARGET)'
 
diff --git a/scripts/init.rootfs b/scripts/init.rootfs
deleted file mode 100644
index 19757b8..0000000
--- a/scripts/init.rootfs
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-export HOME='/root'
-export PS1='\w \h\$ '
-UDHCPC_ARGS=
-
-mkdir -p /dev /proc /sys
-mount -t devtmpfs none /dev -o size=4k
-mount -t proc none /proc
-mount -t sysfs none /sys
-mount -t debugfs nodev /sys/kernel/debug
-
-if [ x"$(command -v klogd)" != x ]; then
-	$(command -v klogd)
-fi
-if [ x"$(command -v syslogd)" != x ]; then
-	$(command -v syslogd) -C
-	UDHCPC_ARGS='-S'
-fi
-
-echo '4 4 1 7' >/proc/sys/kernel/printk
-cat <<EOF
-
-
-Boot took $(cut -d' ' -f1 /proc/uptime) seconds
-
-        _       _     __ _                  
-  /\/\ (_)_ __ (_)   / /(_)_ __  _   ___  __
- /    \| | '_ \| |  / / | | '_ \| | | \ \/ /
-/ /\/\ \ | | | | | / /__| | | | | |_| |>  < 
-\/    \/_|_| |_|_| \____/_|_| |_|\__,_/_/\_\ 
-
-
-Welcome to mini_linux
-
-
-EOF
-
-for arg in $(cat /proc/cmdline | tr '[:upper:]' '[:lower:]'); do
-    if [ x"${arg}" = xip4 ]; then
-        sysctl -w net.ipv6.conf.all.disable_ipv6=1
-    fi
-done
-
-for arg in $(cat /proc/cmdline | tr '[:upper:]' '[:lower:]'); do
-    if [ x"$(command -v udhcpc)" != x -a x"${arg}" = xnet ]; then
-        echo '*** INIT NETWORK ***'
-        for netif in $(ls /sys/class/net); do
-            ifconfig ${netif} 0.0.0.0 up
-        done
-        $(command -v udhcpc) -R ${UDHCPC_ARGS}
-    fi
-done
-
-hostname minlin
-loadkmap </usr/share/keymaps/i386/qwertz/de-latin1.bmap
-cd ${HOME}
-setsid cttyhack sh
-poweroff -f
diff --git a/skeleton/init b/skeleton/init
new file mode 100755
index 0000000..19757b8
--- /dev/null
+++ b/skeleton/init
@@ -0,0 +1,59 @@
+#!/bin/sh
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+export HOME='/root'
+export PS1='\w \h\$ '
+UDHCPC_ARGS=
+
+mkdir -p /dev /proc /sys
+mount -t devtmpfs none /dev -o size=4k
+mount -t proc none /proc
+mount -t sysfs none /sys
+mount -t debugfs nodev /sys/kernel/debug
+
+if [ x"$(command -v klogd)" != x ]; then
+	$(command -v klogd)
+fi
+if [ x"$(command -v syslogd)" != x ]; then
+	$(command -v syslogd) -C
+	UDHCPC_ARGS='-S'
+fi
+
+echo '4 4 1 7' >/proc/sys/kernel/printk
+cat <<EOF
+
+
+Boot took $(cut -d' ' -f1 /proc/uptime) seconds
+
+        _       _     __ _                  
+  /\/\ (_)_ __ (_)   / /(_)_ __  _   ___  __
+ /    \| | '_ \| |  / / | | '_ \| | | \ \/ /
+/ /\/\ \ | | | | | / /__| | | | | |_| |>  < 
+\/    \/_|_| |_|_| \____/_|_| |_|\__,_/_/\_\ 
+
+
+Welcome to mini_linux
+
+
+EOF
+
+for arg in $(cat /proc/cmdline | tr '[:upper:]' '[:lower:]'); do
+    if [ x"${arg}" = xip4 ]; then
+        sysctl -w net.ipv6.conf.all.disable_ipv6=1
+    fi
+done
+
+for arg in $(cat /proc/cmdline | tr '[:upper:]' '[:lower:]'); do
+    if [ x"$(command -v udhcpc)" != x -a x"${arg}" = xnet ]; then
+        echo '*** INIT NETWORK ***'
+        for netif in $(ls /sys/class/net); do
+            ifconfig ${netif} 0.0.0.0 up
+        done
+        $(command -v udhcpc) -R ${UDHCPC_ARGS}
+    fi
+done
+
+hostname minlin
+loadkmap </usr/share/keymaps/i386/qwertz/de-latin1.bmap
+cd ${HOME}
+setsid cttyhack sh
+poweroff -f
-- 
cgit v1.2.3