diff options
| author | Simon Rettberg | 2022-12-15 15:32:26 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2022-12-15 15:32:26 +0100 |
| commit | c75168e0c80564d40fd6f8e9d3c223a4bb0b1cb8 (patch) | |
| tree | 22612d7aee049188f007e6949c02ce99465cfb7f /core | |
| parent | [run-virt] mkfs.vfat makes FAT32, which we don't want for a floppy (diff) | |
| download | mltk-c75168e0c80564d40fd6f8e9d3c223a4bb0b1cb8.tar.gz mltk-c75168e0c80564d40fd6f8e9d3c223a4bb0b1cb8.tar.xz mltk-c75168e0c80564d40fd6f8e9d3c223a4bb0b1cb8.zip | |
[bwlp-stage4-tweaks] Move common files from rfs-stage32 to own module
... so we get them in the MaxiLinux stage4 builds too.
Diffstat (limited to 'core')
| -rw-r--r-- | core/modules/bwlp-stage4-tweaks/data/etc/profile (renamed from core/rootfs/rootfs-stage32/data/etc/profile) | 6 | ||||
| -rw-r--r-- | core/modules/bwlp-stage4-tweaks/data/etc/tmpfiles.d/network.conf (renamed from core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf) | 0 | ||||
| -rwxr-xr-x | core/modules/bwlp-stage4-tweaks/data/opt/openslx/bin/penv (renamed from core/rootfs/rootfs-stage32/data/opt/openslx/bin/penv) | 0 | ||||
| -rw-r--r-- | core/modules/bwlp-stage4-tweaks/module.build | 0 | ||||
| -rw-r--r-- | core/modules/bwlp-stage4-tweaks/module.conf | 0 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf | 1 | ||||
| l--------- | core/targets/bwlp/bwlp-stage4-tweaks | 1 |
7 files changed, 7 insertions, 1 deletions
diff --git a/core/rootfs/rootfs-stage32/data/etc/profile b/core/modules/bwlp-stage4-tweaks/data/etc/profile index b50b1693..2fb2ee67 100644 --- a/core/rootfs/rootfs-stage32/data/etc/profile +++ b/core/modules/bwlp-stage4-tweaks/data/etc/profile @@ -18,6 +18,12 @@ if [ -n "$PWENT" ]; then fi unset PWENT +if [ -L "/bin" ]; then + export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/openslx/sbin:/opt/openslx/bin +else + export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin +fi + # If running interactively, then: if [ "${PS1-}" ]; then diff --git a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf b/core/modules/bwlp-stage4-tweaks/data/etc/tmpfiles.d/network.conf index 346ecf7e..346ecf7e 100644 --- a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf +++ b/core/modules/bwlp-stage4-tweaks/data/etc/tmpfiles.d/network.conf diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/bin/penv b/core/modules/bwlp-stage4-tweaks/data/opt/openslx/bin/penv index 5d0c8dc7..5d0c8dc7 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/bin/penv +++ b/core/modules/bwlp-stage4-tweaks/data/opt/openslx/bin/penv diff --git a/core/modules/bwlp-stage4-tweaks/module.build b/core/modules/bwlp-stage4-tweaks/module.build new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/core/modules/bwlp-stage4-tweaks/module.build diff --git a/core/modules/bwlp-stage4-tweaks/module.conf b/core/modules/bwlp-stage4-tweaks/module.conf new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/core/modules/bwlp-stage4-tweaks/module.conf diff --git a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf b/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf deleted file mode 100644 index 4d93fb9c..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/log/openslx 0777 root root diff --git a/core/targets/bwlp/bwlp-stage4-tweaks b/core/targets/bwlp/bwlp-stage4-tweaks new file mode 120000 index 00000000..55fc3198 --- /dev/null +++ b/core/targets/bwlp/bwlp-stage4-tweaks @@ -0,0 +1 @@ +../../modules/bwlp-stage4-tweaks
\ No newline at end of file |