summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-18 11:15:20 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-18 11:15:20 -0500
commit028c78633b050cc3bff6fbcaad0ecb5caa98d990 (patch)
treefbbaca4245204ab0bd8df7309b0995865c346a60
parente3217c97699c54e4a48f8dc4d294951ec7818fb7 (diff)
downloadimage-028c78633b050cc3bff6fbcaad0ecb5caa98d990.tar.gz
image-028c78633b050cc3bff6fbcaad0ecb5caa98d990.tar.bz2
image-028c78633b050cc3bff6fbcaad0ecb5caa98d990.tar.xz
image-028c78633b050cc3bff6fbcaad0ecb5caa98d990.zip
adelie-build-cd: set -e; don't create shells
-rwxr-xr-xadelie-build-cd7
1 files changed, 1 insertions, 6 deletions
diff --git a/adelie-build-cd b/adelie-build-cd
index 535693b..c27bcb5 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
def_arch=$(uname -m)
def_ver="1.0-beta4"
@@ -190,11 +190,6 @@ make_structure() {
sed -i 's/pam_unix.so$/pam_unix.so nullok_secure/' squashroot-$ARCH/etc/pam.d/base-auth
- cat >squashroot-$ARCH/etc/shells <<- SHELLS
- /bin/bash
- /bin/zsh
- SHELLS
-
cat >squashroot-$ARCH/etc/resolv.conf <<- RESOLVE
nameserver 84.200.69.80
nameserver 2001:1608:10:25::1c04:b12f