From 44b5b6b1a3bc9da029eea3d3874c8b7b17fbca47 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 18 Jun 2019 15:06:58 +0300 Subject: [PATCH] baselayout: Update package. --- repo/baselayout/build | 66 +++++++++++++------------ repo/baselayout/checksums | 12 +++++ repo/baselayout/files/profile | 33 ++++--------- repo/baselayout/manifest | 92 +++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 54 deletions(-) create mode 100644 repo/baselayout/checksums create mode 100644 repo/baselayout/manifest diff --git a/repo/baselayout/build b/repo/baselayout/build index 6d34b611..3b24f60b 100755 --- a/repo/baselayout/build +++ b/repo/baselayout/build @@ -1,50 +1,56 @@ #!/bin/sh -e -# setup base directories +# Setup base directories. for d in boot dev etc home mnt usr var opt run; do - install -d -m755 "$1"/"$d" + install -dm 755 "$1/$d" done -install -d -m555 "$1"/proc -install -d -m555 "$1"/sys -install -d -m0750 "$1"/root -install -d -m1777 "$1"/tmp -# setup /usr hierarchy +install -dm 555 "$1/proc" +install -dm 555 "$1/sys" +install -dm 0750 "$1/root" +install -dm 1777 "$1/tmp" + +# Setup /usr hierarchy. for d in bin include lib lib32 share src; do install -d -m755 "$1"/usr/"$d" done -# setup manpages directories +# Setup manpages directories. for d in 1 2 3 4 5 6 7 8; do - install -d -m755 "$1"/usr/share/man/man"$d" + install -dm 755 "$1/usr/share/man/man$d" done -# add symlinks -ln -s usr/bin "$1"/bin -ln -s usr/bin "$1"/sbin -ln -s bin "$1"/usr/sbin -ln -s usr/lib "$1"/lib -ln -s usr/lib "$1"/lib64 -ln -s lib "$1"/usr/lib64 +# Add symlinks. +ln -s usr/bin "$1/bin" +ln -s usr/bin "$1/sbin" +ln -s bin "$1/usr/sbin" +ln -s usr/lib "$1/lib" +ln -s usr/lib "$1/lib64" +ln -s lib "$1/usr/lib64" -# setup /var +# Setup /var. for d in cache local opt log/old lib/misc empty; do - install -d -m755 "$1"/var/"$d" + install -dm 755 "$1/var/$d" done -install -d -m1777 "$1"/var/tmp -install -d -m1777 "$1"/var/spool/mail -ln -s spool/mail "$1"/var/mail -ln -s ../run "$1"/var/run -ln -s ../run/lock "$1"/var/lock -# setup /usr/local (usually for any programs installed outside package manager) +install -dm 1777 "$1/var/tmp" +install -dm 1777 "$1/var/spool/mail" + +ln -s spool/mail "$1/var/mail" +ln -s ../run "$1/var/run" +ln -s ../run/lock "$1/var/lock" + +# Setup /usr/local (usually for any programs installed outside package manager). for d in bin etc games include lib man sbin share src; do - install -d -m755 "$1"/usr/local/"$d" + install -dm 755 "$1/usr/local/$d" done -ln -s ../man "$1"/usr/local/share/man -# /etc skeleton files -for f in crypttab fstab host.conf hosts issue os-release passwd profile securetty shadow shells; do - install -m644 "$f" "$1"/etc +ln -s ../man "$1/usr/local/share/man" + +# /etc skeleton files. +for f in crypttab fstab host.conf hosts issue os-release \ + passwd profile securetty shadow shells; do + install -m 644 "$f" "$1/etc" done -ln -s /proc/self/mounts "$1"/etc/mtab + +ln -s /proc/self/mounts "$1/etc/mtab" diff --git a/repo/baselayout/checksums b/repo/baselayout/checksums new file mode 100644 index 00000000..b4e2b23f --- /dev/null +++ b/repo/baselayout/checksums @@ -0,0 +1,12 @@ +3698c87cc3af757f0302f6d7f034350b1b22a7f25b2f71944292d0fb3de67cd7 crypttab +e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696 fstab +38c9f4047ba597248ef199a77afbd36f873cfa4aeb70de90bac7f237faf2ecba group +a0fa9cd303cf7f1718f51e5624a671a418946718b790508b8988bccd542c6451 host.conf +eda9afe39a3562406f14cb8a5a142922b63e68467d3ba4821c02eaa142d9c4da hosts +e82a871a81ef0af4063475064857b884b63ad3bc01470dbb85da64a2f4d5dce4 issue +4aff967e535fcaa0bcf1823dad845d28789d61beb73b05e740af2bb21f098b8b os-release +7762b65442cd3e930d9b4ec470e01bc53938bc5ed3d7aedeed47977b78f54843 passwd +5aa69b5acea1deb625c46ce481d96e4e21558ae2e39ca74fc5b6a5674329f403 profile +7e47176cd83b91bdbc3a0b10ae5d5c093b81a9c8c0c1fb714f5438381124c760 securetty +8ce994663d7588143ad7ed4441b07f468f4f7d3590164dd73ddfa3ea307ece8e shadow +8782af2bf81ca1e81b59d1be531565882d4e0c9a89d189706ed358375f67ca04 shells diff --git a/repo/baselayout/files/profile b/repo/baselayout/files/profile index af08ee85..8e5fcd75 100644 --- a/repo/baselayout/files/profile +++ b/repo/baselayout/files/profile @@ -1,31 +1,16 @@ # /etc/profile +# # System wide environment and startup programs. -appendpath () { - case ":$PATH:" in - *:"$1":*) ;; - *) PATH="${PATH:+$PATH:}$1" ;; - esac -} +# Set default path (/usr/sbin:/sbin:/bin included for non-KISS Linux chroots). +export PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin -# Set our default path (/usr/sbin:/sbin:/bin included for non-KISS Linux chroots) -appendpath '/usr/local/sbin' -appendpath '/usr/local/bin' -appendpath '/usr/bin' -appendpath '/usr/sbin' -appendpath '/sbin' -appendpath '/bin' -unset appendpath - -export PATH - -# Set default umask +# Set default umask. umask 022 # Load profiles from /etc/profile.d -if [ -d /etc/profile.d/ ]; then - for f in /etc/profile.d/*.sh; do - [ -r "$f" ] && . "$f" - done - unset f -fi +for file in /etc/profile.d/*.sh; do + [ -r "$file" ] && . "$file" +done + +unset file diff --git a/repo/baselayout/manifest b/repo/baselayout/manifest new file mode 100644 index 00000000..06b0228a --- /dev/null +++ b/repo/baselayout/manifest @@ -0,0 +1,92 @@ +/var/tmp/ +/var/spool/mail/ +/var/spool/ +/var/run +/var/opt/ +/var/mail +/var/log/old/ +/var/log/ +/var/lock +/var/local/ +/var/lib/misc/ +/var/lib/ +/var/empty/ +/var/db/kiss/baselayout/version +/var/db/kiss/baselayout/sources +/var/db/kiss/baselayout/manifest +/var/db/kiss/baselayout/files/shells +/var/db/kiss/baselayout/files/shadow +/var/db/kiss/baselayout/files/securetty +/var/db/kiss/baselayout/files/profile +/var/db/kiss/baselayout/files/passwd +/var/db/kiss/baselayout/files/os-release +/var/db/kiss/baselayout/files/issue +/var/db/kiss/baselayout/files/hosts +/var/db/kiss/baselayout/files/host.conf +/var/db/kiss/baselayout/files/group +/var/db/kiss/baselayout/files/fstab +/var/db/kiss/baselayout/files/crypttab +/var/db/kiss/baselayout/files/ +/var/db/kiss/baselayout/checksums +/var/db/kiss/baselayout/build +/var/db/kiss/baselayout/ +/var/db/kiss/ +/var/db/ +/var/cache/ +/var/ +/usr/src/ +/usr/share/man/man8/ +/usr/share/man/man7/ +/usr/share/man/man6/ +/usr/share/man/man5/ +/usr/share/man/man4/ +/usr/share/man/man3/ +/usr/share/man/man2/ +/usr/share/man/man1/ +/usr/share/man/ +/usr/share/ +/usr/sbin +/usr/local/src/ +/usr/local/share/man +/usr/local/share/ +/usr/local/sbin/ +/usr/local/man/ +/usr/local/lib/ +/usr/local/include/ +/usr/local/games/ +/usr/local/etc/ +/usr/local/bin/ +/usr/local/ +/usr/lib64 +/usr/lib32/ +/usr/lib/ +/usr/include/ +/usr/bin/ +/usr/ +/tmp/ +/sys/ +/sbin +/run/ +/root/ +/proc/ +/opt/ +/mnt/ +/lib64 +/lib +/home/ +/etc/shells +/etc/shadow +/etc/securetty +/etc/profile +/etc/passwd +/etc/os-release +/etc/mtab +/etc/issue +/etc/hosts +/etc/host.conf +/etc/fstab +/etc/crypttab +/etc/ +/dev/ +/boot/ +/bin