summaryrefslogtreecommitdiff
path: root/adelie-build-cd
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2017-09-17 21:21:11 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2017-09-17 21:21:11 -0500
commitae1680fdef094c2ec9ce2327da8c59924df361c7 (patch)
tree4f100e931abc1e97f37d0ff077bb00716f506eff /adelie-build-cd
parent94d3ade3514db4652d76d7ca4014569fcf13e2be (diff)
downloadimage-ae1680fdef094c2ec9ce2327da8c59924df361c7.tar.gz
image-ae1680fdef094c2ec9ce2327da8c59924df361c7.tar.bz2
image-ae1680fdef094c2ec9ce2327da8c59924df361c7.tar.xz
image-ae1680fdef094c2ec9ce2327da8c59924df361c7.zip
adelie-build-cd: adelie-base provides group/passwd/shadow now
Diffstat (limited to 'adelie-build-cd')
-rwxr-xr-xadelie-build-cd15
1 files changed, 10 insertions, 5 deletions
diff --git a/adelie-build-cd b/adelie-build-cd
index 2c94449..ab45a92 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -135,6 +135,11 @@ install_pkgs() {
mkdir -p squashroot-$ARCH/etc/apk/keys
cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/
+ # XXX: Handle pre-install scripts.
+ mkdir -p squashroot-$ARCH/dev
+ mknod squashroot-$ARCH/dev/urandom c 1 9
+ mkdir -p squashroot-$ARCH/usr/sbin
+ cp addgroup adduser squashroot-$ARCH/usr/sbin/
apk --arch $ARCH \
-X "https://distfiles.adelielinux.org/adelie/$VERSION/system/$EXTRA_MIRROR" \
-X "https://distfiles.adelielinux.org/adelie/$VERSION/user/$EXTRA_MIRROR" \
@@ -172,9 +177,9 @@ make_structure() {
proc /proc proc defaults 0 1
FSTAB
- cp passwd-$ARCH squashroot-$ARCH/etc/passwd
- cp group-$ARCH squashroot-$ARCH/etc/group
- cp shadow-$ARCH squashroot-$ARCH/etc/shadow
+ echo 'live:x:1000:1000:Live User:/home/live:/bin/bash' >> squashroot-$ARCH/etc/passwd
+ echo 'live:x:1000:' >> squashroot-$ARCH/etc/group
+ echo 'live::::::::' >> squashroot-$ARCH/etc/shadow
cat >squashroot-$ARCH/etc/shells <<- SHELLS
/bin/bash
@@ -199,8 +204,6 @@ make_structure() {
ISSUE
- chmod 600 squashroot-$ARCH/etc/shadow
-
if test -n "${DO_FULL+full}"; then
declare -r PACKAGES_DIR=squashroot-$ARCH/packages/$ARCH
mkdir -p $PACKAGES_DIR
@@ -258,7 +261,9 @@ make_initrd() {
cp squashroot-$ARCH/bin/udevadm initrd-$ARCH/sbin/
cp squashroot-$ARCH/sbin/udevd initrd-$ARCH/sbin/
cp squashroot-$ARCH/lib/libkmod.so.2 initrd-$ARCH/lib/
+ cp squashroot-$ARCH/usr/lib/liblzma.so.5 initrd-$ARCH/lib/
cp squashroot-$ARCH/lib/libudev.so.1 initrd-$ARCH/lib/
+ cp squashroot-$ARCH/lib/libz.so.1 initrd-$ARCH/lib/
cp squashroot-$ARCH/etc/udev/hwdb.bin initrd-$ARCH/etc/udev/
# init