harald/VerityBook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use /var/roothome as /root

Browse source
This commit is contained in:
Harald Hoyer 2018-09-18 19:02:09 +02:00
parent 27fd0fd8f6
commit 7d149c2c0a
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
prepare-root.sh
View file

@ -513,7 +513,7 @@ if [[ -d "$sysroot"/boot/efi/EFI/fedora ]]; then
fi fi
rm -fr "$sysroot"/{boot,root} rm -fr "$sysroot"/{boot,root}
ln -sfnr "$sysroot"/var/root "$sysroot"/root ln -sfnr "$sysroot"/var/roothome "$sysroot"/root
mkdir "$sysroot"/efi mkdir "$sysroot"/efi
rm -fr "$sysroot"/var rm -fr "$sysroot"/var
rm -fr "$sysroot"/home rm -fr "$sysroot"/home

9
quirks/nss.sh
View file

@ -5,6 +5,7 @@
sed -i -e 's#^\(passwd:.*\) files#\1 files altfiles db#g;s#^\(shadow:.*\) files#\1 files altfiles db#g;s#^\(group:.*\) files#\1 files altfiles db#g' \ sed -i -e 's#^\(passwd:.*\) files#\1 files altfiles db#g;s#^\(shadow:.*\) files#\1 files altfiles db#g;s#^\(group:.*\) files#\1 files altfiles db#g' \
"$sysroot"/etc/nsswitch.conf "$sysroot"/etc/nsswitch.conf
mkdir -p "$sysroot"/usr/db mkdir -p "$sysroot"/usr/db
sed -i -e 's#/var/db#/usr/db#g' "$sysroot"/lib*/libnss_db-2*.so "$sysroot"/var/db/Makefile sed -i -e 's#/var/db#/usr/db#g' "$sysroot"/lib*/libnss_db-2*.so "$sysroot"/var/db/Makefile
@ -13,7 +14,7 @@ egrep -e '^(adm|wheel):.*' "$sysroot"/etc/gshadow > "$sysroot"/etc/gshadow.adm
chmod --reference="$sysroot"/etc/group "$sysroot"/etc/group.adm chmod --reference="$sysroot"/etc/group "$sysroot"/etc/group.adm
chmod --reference="$sysroot"/etc/gshadow "$sysroot"/etc/gshadow.adm chmod --reference="$sysroot"/etc/gshadow "$sysroot"/etc/gshadow.adm
sed -i -e 's#:/root:#:/var/root:#g' "$sysroot"/etc/passwd sed -i -e 's#:/root:#:/var/roothome:#g' "$sysroot"/etc/passwd
sed -i -e '/^wheel:.*/d;/^adm:.*/d' "$sysroot"/etc/group "$sysroot"/etc/gshadow sed -i -e '/^wheel:.*/d;/^adm:.*/d' "$sysroot"/etc/group "$sysroot"/etc/gshadow
@ -66,11 +67,11 @@ sed -i -e 's#/etc/.pwd.lock#/cfg/.pwd.lock#g' \
&& sed -i -e 's#/etc/.pwd.lock#/cfg/.pwd.lock#g' \ && sed -i -e 's#/etc/.pwd.lock#/cfg/.pwd.lock#g' \
"$sysroot"/usr/lib*/librpmostree-1.so.1 "$sysroot"/usr/lib*/librpmostree-1.so.1
mkdir -p "$sysroot"/usr/share/factory/var/root mkdir -p "$sysroot"/usr/share/factory/var/roothome
chown +0.+0 "$sysroot"/usr/share/factory/var/root chown +0.+0 "$sysroot"/usr/share/factory/var/roothome
cat > "$sysroot"/usr/lib/tmpfiles.d/home.conf <<EOF cat > "$sysroot"/usr/lib/tmpfiles.d/home.conf <<EOF
C /var/root - - - - - C /var/roothome - - - - -
C /cfg/passwd - - - - - C /cfg/passwd - - - - -
C /cfg/shadow - - - - - C /cfg/shadow - - - - -
C /cfg/group - - - - - C /cfg/group - - - - -