diff options
| author | Jonathan Bauer | 2019-06-13 12:27:29 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-06-13 12:27:29 +0200 |
| commit | 1c94fca491c4a9253052e8f2c897698a3ae295b2 (patch) | |
| tree | b96d5ce2dda8357c34ed5640d465bd3046139f15 /core | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [systemd] add missing deps (diff) | |
| download | mltk-1c94fca491c4a9253052e8f2c897698a3ae295b2.tar.gz mltk-1c94fca491c4a9253052e8f2c897698a3ae295b2.tar.xz mltk-1c94fca491c4a9253052e8f2c897698a3ae295b2.zip | |
Merge branch 'master' into installer
Diffstat (limited to 'core')
| -rw-r--r-- | core/modules/systemd/module.conf.ubuntu | 2 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage32/module.build | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/modules/systemd/module.conf.ubuntu b/core/modules/systemd/module.conf.ubuntu index f742bb03..c1d329c6 100644 --- a/core/modules/systemd/module.conf.ubuntu +++ b/core/modules/systemd/module.conf.ubuntu @@ -1,6 +1,8 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" intltool + libtool + gperf dbus libcap-dev libudev-dev diff --git a/core/rootfs/rootfs-stage32/module.build b/core/rootfs/rootfs-stage32/module.build index a33025e7..d012fbc7 100644 --- a/core/rootfs/rootfs-stage32/module.build +++ b/core/rootfs/rootfs-stage32/module.build @@ -88,10 +88,6 @@ post_copy() { mkdir -p "$TARGET_BUILD_DIR"/{bin,dev,proc,lib,etc,mnt,run,sys,var,opt/openslx/mnt} ln -s -n -f -t "$TARGET_BUILD_DIR/var" "../run/lock" "../run" - # copy devices from running system - cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,urandom,zero} \ - "${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed." - # set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin #add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" |