diff --git a/layer/router-alix/interfaces/port0 b/layer/router-alix/interfaces/port0 deleted file mode 100644 index 09fba90..0000000 --- a/layer/router-alix/interfaces/port0 +++ /dev/null @@ -1 +0,0 @@ -ip 192.168.0.1/24 diff --git a/layer/router-alix/interfaces/port1 b/layer/router-alix/interfaces/port1 deleted file mode 100644 index 4d0c576..0000000 --- a/layer/router-alix/interfaces/port1 +++ /dev/null @@ -1 +0,0 @@ -ip 192.168.1.1/24 diff --git a/layer/router-alix/netcfg_static b/layer/router-alix/netcfg_static new file mode 100644 index 0000000..86c75d5 --- /dev/null +++ b/layer/router-alix/netcfg_static @@ -0,0 +1,2 @@ +addr add 192.168.0.1/24 dev port0 +addr add 192.168.1.1/24 dev port1 diff --git a/layer/router-rpi3/interfaces/wlan0 b/layer/router-rpi3/interfaces/wlan0 deleted file mode 100644 index 09fba90..0000000 --- a/layer/router-rpi3/interfaces/wlan0 +++ /dev/null @@ -1 +0,0 @@ -ip 192.168.0.1/24 diff --git a/layer/router-rpi3/netcfg_static b/layer/router-rpi3/netcfg_static new file mode 100644 index 0000000..f0d49fb --- /dev/null +++ b/layer/router-rpi3/netcfg_static @@ -0,0 +1 @@ +addr add 192.168.0.1/24 dev wlan0 diff --git a/pkg/init-scripts/build b/pkg/init-scripts/build index a6ada6e..dc40e51 100755 --- a/pkg/init-scripts/build +++ b/pkg/init-scripts/build @@ -1,8 +1,8 @@ -VERSION="3" +VERSION="4" SRCDIR="init-scripts-${VERSION}" TARBALL="${SRCDIR}.tar.xz" URL="http://infraroot.at/pygos" -SHA256SUM="529f91c59cecda5bbe954e73bbddddaa22e80ac49e85b7bb785c3cee2397f070" +SHA256SUM="dbfc67b01376d6607c69bc845c31e2f792f20773c829973ae6bfb57ac30699ae" DEPENDS="toolchain" prepare() { @@ -87,14 +87,11 @@ deploy() { echo "file etc/sysctl.conf 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files" fi - svc=$(file_path_override "interfaces") + svc=$(file_path_override "netcfg_static") if [ ! -z "$svc" ]; then - for svc in $svc/*; do - [ -f "$svc" ] || continue - cp "$svc" "$PKGDEPLOYDIR/etc/netcfg/" - svc=$(basename $svc) - echo "file etc/netcfg/$svc 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files" - done + mkdir -p "$PKGDEPLOYDIR/netcfg" + cp "$svc" "$PKGDEPLOYDIR/netcfg/static" + echo "file etc/netcfg/static 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files" fi for svc in $GETTY_TTY; do diff --git a/pkg/init-scripts/init-scripts.files b/pkg/init-scripts/init-scripts.files index a00704e..ad7cf2a 100644 --- a/pkg/init-scripts/init-scripts.files +++ b/pkg/init-scripts/init-scripts.files @@ -29,13 +29,13 @@ slink etc/init.d/sysinit 0777 0 0 /share/init/sysinit slink etc/init.d/tmpfs 0777 0 0 /share/init/tmpfs slink etc/init.d/tmpfsrun 0777 0 0 /share/init/tmpfsrun slink etc/init.d/tmpfsvar 0777 0 0 /share/init/tmpfsvar +slink etc/init.d/unmount@reboot 0777 0 0 /share/init/unmount +slink etc/init.d/unmount@shutdown 0777 0 0 /share/init/unmount slink etc/init.d/usyslogd 0777 0 0 /share/init/usyslogd slink etc/init.d/vfs 0777 0 0 /share/init/vfs file etc/netcfg/ifrename 0644 0 0 file etc/initd.env 0644 0 0 file etc/modules 0644 0 0 -file lib/libexec/init/devfs.sh 0755 0 0 -file lib/libexec/init/ifcfg.sh 0755 0 0 file lib/libexec/init/ifdown.sh 0755 0 0 file lib/libexec/init/ifrename.sh 0755 0 0 file lib/libexec/init/modules_load.sh 0755 0 0 @@ -73,5 +73,6 @@ file share/init/tmpfs 0644 0 0 file share/init/tmpfsrun 0644 0 0 file share/init/tmpfsvar 0644 0 0 file share/init/unbound 0644 0 0 +file share/init/unmount 0644 0 0 file share/init/usyslogd 0644 0 0 file share/init/vfs 0644 0 0