Skip to content

Commit

Permalink
bash: Make symlinks for sh in /usr/bin and /bin and symlink bash in /bin
Browse files Browse the repository at this point in the history
prepare-sysroot: Remove symlinks for bash, as bash handles this on install

Signed-off-by: Dennisbonke <admin@dennisbonke.com>
  • Loading branch information
Dennisbonke committed Jun 5, 2020
1 parent 141653f commit be603a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 5 additions & 1 deletion bootstrap.d/app-shells.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ packages:
quiet: true
- args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/root/']
- args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/etc/']
- args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/bin/']
- args: ['cp', '@SOURCE_ROOT@/extrafiles/.bashrc', '@THIS_COLLECT_DIR@/root']
- args: ['cp', '@SOURCE_ROOT@/extrafiles/profile', '@THIS_COLLECT_DIR@/etc']
- args: ['cp', '@SOURCE_ROOT@/extrafiles/bash.bashrc', '@THIS_COLLECT_DIR@/etc']
- args: ['cp', '@SOURCE_ROOT@/extrafiles/bash.bashrc', '@THIS_COLLECT_DIR@/etc']
- args: ['ln', '-sf', 'bash', '@THIS_COLLECT_DIR@/usr/bin/sh']
- args: ['ln', '-sf', 'bash', '@THIS_COLLECT_DIR@/bin/bash']
- args: ['ln', '-sf', 'bash', '@THIS_COLLECT_DIR@/bin/sh']
2 changes: 0 additions & 2 deletions scripts/prepare-sysroot
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ mkdir -p system-root/usr/share/X11
mkdir -p system-root/var

# Create some symlinks that are currently required.
ln -sf /usr/bin/bash system-root/bin/bash
ln -sf /usr/bin/bash system-root/bin/sh
ln -sf /usr/lib/ld.so system-root/lib/ld-init.so

# Copy stuff from the host system.
Expand Down

0 comments on commit be603a3

Please sign in to comment.