summaryrefslogtreecommitdiff
path: root/adelie-build-txz
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-22 01:34:00 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-08-22 01:34:00 +0000
commit8cdc3988b1b29f7a6de118118adc15abfa4ac65b (patch)
tree96f3762dc7cce881ee86858fec9c01d0fb960e27 /adelie-build-txz
parentd0b68602b88efb42a8914c85b72d5f83ff2e85fe (diff)
downloadimage-8cdc3988b1b29f7a6de118118adc15abfa4ac65b.tar.gz
image-8cdc3988b1b29f7a6de118118adc15abfa4ac65b.tar.bz2
image-8cdc3988b1b29f7a6de118118adc15abfa4ac65b.tar.xz
image-8cdc3988b1b29f7a6de118118adc15abfa4ac65b.zip
adelie-build-txz: bring in line with adelie-build-cd changes
Diffstat (limited to 'adelie-build-txz')
-rwxr-xr-xadelie-build-txz12
1 files changed, 4 insertions, 8 deletions
diff --git a/adelie-build-txz b/adelie-build-txz
index 0d7bae0..a637772 100755
--- a/adelie-build-txz
+++ b/adelie-build-txz
@@ -172,14 +172,10 @@ make_structure() {
proc /proc proc defaults 0 1
FSTAB
- cat >rootfs-$ARCH/etc/shells <<- SHELLS
- /bin/bash
- /bin/zsh
- SHELLS
-
cat >rootfs-$ARCH/etc/resolv.conf <<- RESOLVE
- nameserver 84.200.69.80
- nameserver 2001:1608:10:25::1c04:b12f
+ nameserver 2620:fe::fe
+ nameserver 9.9.9.9
+ nameserver 149.112.112.112
RESOLVE
cat >rootfs-$ARCH/etc/apk/repositories <<-REPOS
@@ -189,7 +185,7 @@ make_structure() {
}
tar_it() {
- header 'Creating compressed file system image...'
+ header 'Creating file system archive...'
cd rootfs-$ARCH
tar -cJf ../out/adelie-rootfs-${MINI+mini-}$ARCH-$VERSION-$(date +%Y%m%d).txz .