From 99b2a509e935d35f95b04f9a99a7b1ff252e470d Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 1 Mar 2018 18:36:53 +0100
Subject: fixed bugs in pam, building pam in stage3 fixed bugs in create_hdd.sh
 (groups, build user, /dev filesystem)

---
 build_stage3.sh       |  7 ++-----
 create_hdd.sh         | 11 +++++------
 i486-stage2/pam/DESCR |  2 +-
 i486-stage3/pam/DESCR | 11 +++++++++++
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 i486-stage3/pam/DESCR

diff --git a/build_stage3.sh b/build_stage3.sh
index ad2507e..59aeb0e 100755
--- a/build_stage3.sh
+++ b/build_stage3.sh
@@ -14,7 +14,7 @@ ncurses readline bash joe
 attr acl m4 gmp gdbm db perl openssl
 libunistring gettext perl-locale-gettext help2man
 autoconf automake perl-error pcre2 git libtool
-zlib pambase cracklib flex libcap
+zlib pambase cracklib flex pam libcap
 e2fsprogs expat bzip2 lz4 xz pcre less gzip
 tar libarchive
 icu
@@ -33,7 +33,6 @@ which
 
 #~ stage2:
 #~ 
-# 
 # git problem, not base of base-devel, but needed to checkout out via
 # https+git protocoll. For now using the stage2 one
 #
@@ -47,8 +46,7 @@ which
 #~ krb5: e2fsprogs libldap keyutils 
 #~ libtirpc: krb5
 
-#~ pam: w3m docbook-xml docbook-xsl
-#~         coreutils
+#~ coreutils
 #~ util-linux:
 #~ pkg-config: glib2
 
@@ -138,7 +136,6 @@ which
 #~ openssh: krb5 openssl libedit ldns 
 #~ p11-kit: glibc libtasn1 libffi 
 #~ pacman: bash glibc libarchive curl gpgme pacman-mirrorlist archlinux-keyring 
-#~ pam: glibc cracklib libtirpc pambase 
 #~ pciutils: glibc hwids kmod 
 #~ pcmciautils: systemd 
 #~ pinentry: ncurses libcap libassuan libsecret 
diff --git a/create_hdd.sh b/create_hdd.sh
index 2862156..78084cf 100755
--- a/create_hdd.sh
+++ b/create_hdd.sh
@@ -48,12 +48,11 @@ cat >etc/init/boot <<EOF
 #!/bin/sh
 mount -t proc proc /proc
 ln -s /proc/self/fd /dev/fd
-mkdir /dev/pts
-mount -t devpts devpts /dev/pts
-ln -s /proc/self/fd /dev/fd
 ln -s /proc/self/fd/0 /dev/stdin
 ln -s /proc/self/fd/1 /dev/stdout
 ln -s /proc/self/fd/2 /dev/stderr
+mkdir /dev/pts
+mount -t devpts devpts /dev/pts
 ln -s /proc/kcore /dev/core
 mount -t sysfs sys /sys
 mount -o remount,rw /
@@ -88,6 +87,7 @@ cp "$HOME/.ssh/id_rsa.pub" root/.ssh/authorized_keys
 
 # install a build user and build directory
 cat >> etc/group <<EOF
+tty:x:5:
 build:x:1001:
 EOF
 cat >> etc/passwd <<EOF
@@ -97,9 +97,8 @@ mkdir -p build
 mkdir build/.ssh
 cp "$HOME/.ssh/id_rsa.pub" build/.ssh/authorized_keys
 chown 1001:1001 build
-# TODO: why does su require a password though we want to login via
-# SSH and key only!?
-#echo 'build:xx' | chpasswd
+# default PAM rules expect a password to be set for su?
+echo 'build:xx' | chpasswd
 
 # add some test programs to test the C and C++ compiler
 
diff --git a/i486-stage2/pam/DESCR b/i486-stage2/pam/DESCR
index b2c19a2..6ac8760 100644
--- a/i486-stage2/pam/DESCR
+++ b/i486-stage2/pam/DESCR
@@ -18,4 +18,4 @@ sed -i '/patch -Np/ a \  patch -Np1 -i "${srcdir}/pam-1.3.0-unix-passwd-no-yp.pa
 sed -i 's@./configure@./configure --disable-regenerate-docu@' PKGBUILD
 
 # no documentation built, so nothing to remove
-sed -i '2!N; /# FS #40749\n \+rm/ s/rm/#rm/g' PKGBUILD
+sed -i '1!N; /# FS #40749\n \+rm/ s/rm/#rm/g' PKGBUILD
diff --git a/i486-stage3/pam/DESCR b/i486-stage3/pam/DESCR
new file mode 100644
index 0000000..a3e5015
--- /dev/null
+++ b/i486-stage3/pam/DESCR
@@ -0,0 +1,11 @@
+# no w3m, docboox-xml/xsl
+# tons of tools needed to build documentation, we ommit the documentation right now
+sed -i "/makedepends=/s/'w3m'//" PKGBUILD
+sed -i "/makedepends=/s/'docbook-xml.*'//" PKGBUILD
+sed -i "/makedepends=/s/'docbook-xsl'//" PKGBUILD
+
+# disable docu rebuilding
+sed -i 's@./configure@./configure --disable-regenerate-docu@' PKGBUILD
+
+# no documentation built, so nothing to remove
+sed -i '1!N; /# FS #40749\n \+rm/ s/rm/#rm/g' PKGBUILD
-- 
cgit v1.2.3-70-g09d2