diff options
| author | Simon Rettberg | 2014-01-15 17:01:20 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-15 17:01:20 +0100 |
| commit | 0e54b9468d137100ba148ada15479b7b1625dd4f (patch) | |
| tree | d93e8c3088ea4e9bcafc8d387403f4c731e3fb0f | |
| parent | <system startup> rework dhcp request: try to get an address (and dns/hostname... (diff) | |
| download | tm-scripts-0e54b9468d137100ba148ada15479b7b1625dd4f.tar.gz tm-scripts-0e54b9468d137100ba148ada15479b7b1625dd4f.tar.xz tm-scripts-0e54b9468d137100ba148ada15479b7b1625dd4f.zip | |
Move udhcpc stuff to its own module. Was spread across systemd and rootfs-stage32
10 files changed, 24 insertions, 0 deletions
diff --git a/remote/modules/dhcpc-busybox/README b/remote/modules/dhcpc-busybox/README new file mode 100644 index 00000000..5dd78e73 --- /dev/null +++ b/remote/modules/dhcpc-busybox/README @@ -0,0 +1,7 @@ +This module requires that busybox udhcpc is present in stage 3.2 + +The default setup builds busybox with udhcpc, puts it in stage 3.1 +which copies it to stage 3.2 before the switchroot happens. That's +why there is no direct dependency in this module's .conf: busybox +is not part of the stage 3.2 target. + diff --git a/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service b/remote/modules/dhcpc-busybox/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service index dff66b14..dff66b14 120000 --- a/remote/modules/systemd/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service +++ b/remote/modules/dhcpc-busybox/data/etc/systemd/system/sysinit.target.wants/udhcpc@br0.service diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service index 6547de5b..6547de5b 100644 --- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service +++ b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-udhcpc++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++ index f3de82df..f3de82df 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-udhcpc++ +++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++ diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx index b6ea93c4..b6ea93c4 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx +++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx diff --git a/remote/modules/dhcpc-busybox/dhcpc-busybox.build b/remote/modules/dhcpc-busybox/dhcpc-busybox.build new file mode 100644 index 00000000..d8804784 --- /dev/null +++ b/remote/modules/dhcpc-busybox/dhcpc-busybox.build @@ -0,0 +1,13 @@ + +fetch_source() { + : +} + +build() { + : +} + +post_copy() { + : +} + diff --git a/remote/modules/dhcpc-busybox/dhcpc-busybox.conf b/remote/modules/dhcpc-busybox/dhcpc-busybox.conf new file mode 100644 index 00000000..c01ade29 --- /dev/null +++ b/remote/modules/dhcpc-busybox/dhcpc-busybox.conf @@ -0,0 +1 @@ +# Nothing diff --git a/remote/targets/stage32-bwlp/dhcpc-busybox b/remote/targets/stage32-bwlp/dhcpc-busybox new file mode 120000 index 00000000..ea3634e6 --- /dev/null +++ b/remote/targets/stage32-bwlp/dhcpc-busybox @@ -0,0 +1 @@ +../../modules/dhcpc-busybox
\ No newline at end of file diff --git a/remote/targets/stage32-opensuse/dhcpc-busybox b/remote/targets/stage32-opensuse/dhcpc-busybox new file mode 120000 index 00000000..ea3634e6 --- /dev/null +++ b/remote/targets/stage32-opensuse/dhcpc-busybox @@ -0,0 +1 @@ +../../modules/dhcpc-busybox
\ No newline at end of file diff --git a/remote/targets/stage32/dhcpc-busybox b/remote/targets/stage32/dhcpc-busybox new file mode 120000 index 00000000..ea3634e6 --- /dev/null +++ b/remote/targets/stage32/dhcpc-busybox @@ -0,0 +1 @@ +../../modules/dhcpc-busybox
\ No newline at end of file |