summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Rebischke <Chris.Rebischke@posteo.de>2017-05-07 21:26:42 +0200
committerChristian Rebischke <Chris.Rebischke@posteo.de>2017-05-07 21:26:42 +0200
commit6bd649fc4b74d10e183531cd046ee7872fedb40e (patch)
tree42d7ad54398e3596cb7a13d6ae965f1d6e1420be
parenta7c15082fcc29f56911e0a36af4133b73e1c9e26 (diff)
downloadarch-boxes32-6bd649fc4b74d10e183531cd046ee7872fedb40e.tar.xz
Different enhancements
added polkit to pacstrap for systemctl poweroff, added sudo to poweroff command, moved link for systemd-resolved to postinstall.sh
-rw-r--r--http/install-chroot.sh3
-rw-r--r--http/install.sh2
-rw-r--r--provision/postinstall.sh3
-rw-r--r--vagrant.json2
4 files changed, 5 insertions, 5 deletions
diff --git a/http/install-chroot.sh b/http/install-chroot.sh
index af83213..28e4921 100644
--- a/http/install-chroot.sh
+++ b/http/install-chroot.sh
@@ -37,9 +37,6 @@ Name=eth0
DHCP=ipv4
EOF
-systemctl start systemd-resolved
-ln -sf /var/run/systemd/resolve/resolv.conf /etc/resolv.conf
-
# enabling important services
systemctl enable sshd
systemctl enable systemd-networkd
diff --git a/http/install.sh b/http/install.sh
index 9c8007b..682bdd5 100644
--- a/http/install.sh
+++ b/http/install.sh
@@ -28,7 +28,7 @@ mount "${device}2" /mnt
cp /etc/pacman.d/mirrorlist /tmp/mirrorlist.backup
sed -i 's/^#Server/Server/' /tmp/mirrorlist.backup
rankmirrors -vn 6 /tmp/mirrorlist.backup > /etc/pacman.d/mirrorlist
-pacstrap /mnt base grub openssh sudo
+pacstrap /mnt base grub openssh sudo polkit
swapon "${device}1"
genfstab -p /mnt >> /mnt/etc/fstab
swapoff "${device}1"
diff --git a/provision/postinstall.sh b/provision/postinstall.sh
index 245df8d..be094e4 100644
--- a/provision/postinstall.sh
+++ b/provision/postinstall.sh
@@ -9,3 +9,6 @@ localectl set-locale "LANG=en_US.UTF-8"
localectl set-keymap "us"
localectl set-x11-keymap "us"
timedatectl set-ntp true
+
+#setting link to systemd-resolved
+ln -sf /var/run/systemd/resolve/resolv.conf /etc/resolv.conf
diff --git a/vagrant.json b/vagrant.json
index 912b18c..11f791c 100644
--- a/vagrant.json
+++ b/vagrant.json
@@ -18,7 +18,7 @@
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
- "shutdown_command": "systemctl poweroff",
+ "shutdown_command": "sudo systemctl poweroff",
"guest_additions_mode": "disable",
"vboxmanage": [
[