lesderid
/
scaleway-image-archlinux
mirror of https://github.com/lesderid/image-archlinux
1
0
Fork 0
Code Issues Releases Wiki Activity

Added |, &&, ; and || support in do_in_target

This commit is contained in:
Manfred Touron 2014-10-28 17:42:19 +00:00
parent c8367a5e68
commit a4af6b8df2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
images/archlinux-latest/build
View File

@ -27,7 +27,7 @@ patch_image() {
sudo mount -t sysfs sys $TARGET/sys
sudo mount -o bind /dev $TARGET/dev
sudo rm -f $TARGET/etc/mtab
do_in_target grep -v rootfs /proc/mounts | sudo tee -a $TARGET/etc/mtab
do_in_target "grep -v rootfs /proc/mounts | sudo tee -a $TARGET/etc/mtab"
sudo mkdir -p $TARGET/run/systemd/resolve
sudo cp /etc/resolv.conf $TARGET/run/systemd/resolve/resolv.conf
@ -35,11 +35,11 @@ patch_image() {
# FIXME: patch_target archlinux-latest/patches
# FIXME: locales
# - do_in_target locale-gen en_US.UTF-8
# - do_in_target "locale-gen en_US.UTF-8"
# ssh server
do_in_target pacman -S --noconfirm openssh
do_in_target systemctl enable sshd.service
do_in_target "pacman -S --noconfirm openssh"
do_in_target "systemctl enable sshd.service"
# clean chroot
sudo rm -f $TARGET/etc/mtab $TARGET/run/systemd/resolve/resolv.conf

2
images/lib.sh
View File

@ -76,7 +76,7 @@ archive_target() {
}
do_in_target() {
sudo chroot "$TARGET" $@
sudo chroot "$TARGET" su - root -c "$@"
}
push_to_s3() {