diff options
Diffstat (limited to 'libre/filesystem')
22 files changed, 189 insertions, 66 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 94d5390ab..6fc74fe5a 100644..100755 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,41 +1,31 @@ -# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $ +# $Id: PKGBUILD 169557 2012-10-23 14:38:06Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2012.2 -pkgrel=5 +pkgver=2012.10 +pkgrel=2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') url='https://parabolagnulinux.org' groups=('base') install='filesystem.install' -depends=('iana-etc' 'bash' 'coreutils') +makedepends=('asciidoc') +depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname') backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' - 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells' - 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') -md5sums=('772fe869b921698cc3e6fde73c4ac85a' - '6be47d893fd49b2e4a8c0e811b350861' - '13753e4e0964f3652b0cc60a28528bdf' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ca716f853860199c1286e7939b2f2666' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130') + 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' + 'locale.sh') + +build() { + cd ${srcdir} + a2x -d manpage -f manpage parabola.7.txt +} package() { cd ${pkgdir} @@ -43,10 +33,11 @@ package() { # # setup root filesystem # - for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do + for d in boot dev etc home media mnt usr var opt srv/http run; do install -d -m755 ${d} done install -d -m555 proc + install -d -m555 sys install -d -m0750 root install -d -m1777 tmp # vsftpd won't run with write perms on /srv/ftp @@ -54,7 +45,7 @@ package() { # setup /etc install -d etc/{ld.so.conf.d,skel,profile.d} - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do + for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do install -m644 ${srcdir}/${f} etc/ done ln -s /proc/self/mounts etc/mtab @@ -63,19 +54,18 @@ package() { done touch etc/arch-release install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf + install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh # setup /var - for d in cache/man local opt log/old lib/misc empty run; do + for d in cache/man local opt log/old lib/misc empty; do install -d -m755 var/${d} done - install -d -m1777 var/{tmp,spool/mail,lock} + install -d -m1777 var/{tmp,spool/mail} # allow setgid games to write scores install -d -m775 -g games var/games ln -s spool/mail var/mail - # not ready yet, needs possible change in pacman or other magic - # is fixed by initscripts on next boot -# ln -s ../run var/run -# ln -s ../run/lock var/lock + ln -s ../run var/run + ln -s ../run/lock var/lock # # setup /usr hierarchy @@ -87,6 +77,10 @@ package() { install -d -m755 usr/share/man/man${d} done + # + # install parabola(7) manpage + # + install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 # # setup /usr/local hierarchy @@ -96,3 +90,23 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('004013ac940ef3d3cdd8c596e7accfe1' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '455b78cada80f40b6f6968f5cbd97a2e' + '01249bb0ba4468f95e2cc3a627f5e6e3' + 'ca716f853860199c1286e7939b2f2666' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + '677523dbe94b79299aa91b35ed8203b6' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130' + '9f445ef4f7785d04504886fb223ee401' + '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab index dd6994b5a..195945a74 100644..100755 --- a/libre/filesystem/crypttab +++ b/libre/filesystem/crypttab @@ -1,33 +1,17 @@ -# crypttab: Mappings for encrypted partitions +# crypttab: mappings for encrypted partitions # # Each mapped device will be created in /dev/mapper, so your /etc/fstab -# should use the /dev/mapper/{NAME} paths for encrypted devices. +# should use the /dev/mapper/<name> paths for encrypted devices. # -# Each PASSWORD field can be an absolute pathname to a key file (starting -# with a slash, recommended) or a literal string that will be used as -# a passphrase. To use special characters in the passphrase, surround it -# by quotes, the usual bash quoting rules apply. -# There are two special keywords that cannot be used as passphrases: -# - ASK ask for a passphrase on boot -# - SWAP use a random key and create a swapspace afterwards -# WARNING: use the SWAP keyword carefully, as it overwrites the data -# on the specified partition -# -# To create a key file: -# hashalot -n 32 ripemd160 >/etc/crytfs.key -# or -# dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1 -# -# To pass additional options to cryptsetup for non-LUKS partitions, use the -# fourth column. +# The Arch specific syntax has been deprecated, see crypttab(5) for the +# new supported syntax. # # NOTE: Do not list your root (/) partition here, it must be set up # beforehand by the initramfs (/etc/mkinitcpio.conf). - -# NAME SOURCE DEVICE PASSWORD OPTIONS -#home /dev/hda4 mypassword -#data1 /dev/hda3 "my \"password\"" -#data2 /dev/hda5 /etc/cryptfs.key -#swap /dev/hdx4 SWAP -c aes-cbc-essiv:sha256 -s 256 -#vol /dev/hdb7 ASK +# <name> <device> <password> <options> +# home /dev/hda4 /etc/mypassword1 +# data1 /dev/hda3 /etc/mypassword2 +# data2 /dev/hda5 /etc/cryptfs.key +# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 +# vol /dev/hdb7 none diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 8cef64bb6..34fcc0dee 100644..100755 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -1,11 +1,11 @@ post_install() { - [ -f var/log/lastlog ] || : >var/log/lastlog - [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/log/btmp ] || (: >var/log/btmp && chmod 600 var/log/btmp) + [ -f var/log/lastlog ] || : >var/log/lastlog + [ -f var/log/wtmp ] || : >var/log/wtmp + [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; } # workaround for bug #7194 # readded due to bug #9465 # please do not remove! - chmod 1777 var/spool/mail tmp var/tmp var/lock + chmod 1777 var/spool/mail tmp var/tmp } # args: <group> [options] @@ -40,9 +40,12 @@ post_upgrade() { _adduser http -u 33 -d /srv/http -g http -s /bin/false _addgroup scanner -g 96 _addgroup rfkill -g 24 + _addgroup lock -g 54 + _addgroup uuidd -g 68 + _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin - # sync gshadow to group (fixes FS#19869 - if ! grep -q '^rfkill:' etc/gshadow; then + # sync gshadow to group (fixes FS#19869) + if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab index f7f9298d4..f7f9298d4 100644..100755 --- a/libre/filesystem/fstab +++ b/libre/filesystem/fstab diff --git a/libre/filesystem/group b/libre/filesystem/group index 261746d9e..cfee1f23e 100644..100755 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -19,6 +19,8 @@ rfkill:x:24: smmsp:x:25: http:x:33: games:x:50: +lock:x:54: +uuidd:x:68: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index ed176823e..c5ac18581 100644..100755 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -19,6 +19,8 @@ rfkill:x:: smmsp::: http::: games::: +lock::: +uuidd:!:: network:x:: video:x:: audio::: diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf index cf52fe561..cf52fe561 100644..100755 --- a/libre/filesystem/host.conf +++ b/libre/filesystem/host.conf diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts index 1747f9196..1747f9196 100644..100755 --- a/libre/filesystem/hosts +++ b/libre/filesystem/hosts diff --git a/libre/filesystem/issue b/libre/filesystem/issue index b001c55dd..b001c55dd 100644..100755 --- a/libre/filesystem/issue +++ b/libre/filesystem/issue diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem/ld.so.conf index dfac45683..dfac45683 100644..100755 --- a/libre/filesystem/ld.so.conf +++ b/libre/filesystem/ld.so.conf diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh new file mode 100644 index 000000000..5fd4174d5 --- /dev/null +++ b/libre/filesystem/locale.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ + LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION + +if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" +elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" +elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf +elif [ -r /etc/rc.conf ]; then + LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") +fi + +export LANG="${LANG:-C}" +[ -n "$LC_CTYPE" ] && export LC_CTYPE +[ -n "$LC_NUMERIC" ] && export LC_NUMERIC +[ -n "$LC_TIME" ] && export LC_TIME +[ -n "$LC_COLLATE" ] && export LC_COLLATE +[ -n "$LC_MONETARY" ] && export LC_MONETARY +[ -n "$LC_MESSAGES" ] && export LC_MESSAGES +[ -n "$LC_PAPER" ] && export LC_PAPER +[ -n "$LC_NAME" ] && export LC_NAME +[ -n "$LC_ADDRESS" ] && export LC_ADDRESS +[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE +[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT +[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first index 947379411..947379411 100644..100755 --- a/libre/filesystem/modprobe.d.usb-load-ehci-first +++ b/libre/filesystem/modprobe.d.usb-load-ehci-first diff --git a/libre/filesystem/motd b/libre/filesystem/motd index e69de29bb..e69de29bb 100644..100755 --- a/libre/filesystem/motd +++ b/libre/filesystem/motd diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf index 6e459adb6..4a4f5770d 100644..100755 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem/nsswitch.conf @@ -6,7 +6,7 @@ shadow: files publickey: files -hosts: files dns +hosts: files dns myhostname networks: files protocols: files diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release new file mode 100755 index 000000000..fe5f20b4f --- /dev/null +++ b/libre/filesystem/os-release @@ -0,0 +1,8 @@ +NAME="Parabola" +ID=parabola +ID_LIKE=arch +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" +HOME_URL="https://parabolagnulinux.org/" +BUG_REPORT_URL="https://labs.parabola.nu/" + diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt new file mode 100644 index 000000000..23a44bb22 --- /dev/null +++ b/libre/filesystem/parabola.7.txt @@ -0,0 +1,80 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet: +///// +parabola(7) +============ + +NAME +---- +parabola - basic configuration + +SYNOPSIS +-------- +Overview of the basic configuration of Parabola GNU/Linux-libre. + +DESCRIPTION +----------- +Parabola exposes the user to the system without hiding any details. This manpage gives a +brief overview of the configuration files that should be set up on a fresh install. + +SYSTEM SERVICES[[S]] +-------------------- +System services to be started at boot can be enabled using 'systemctl enable <name>.service'. To view +available services use 'systemctl list-unit-files'. + +HOSTNAME[[H]] +------------- +The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. It will then be +written to /etc/hostname. + +LOCALIZATION[[L]] +----------------- +Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used +can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a +user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists. + +VIRTUAL CONSOLE[[V]] +-------------------- +The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among +other things. Note that these settings only apply to the console, and not if you use X. + +TIME[[T]] +--------- +The local timezone is configured by calling 'timedatectl set-timezone <Region/City>'. A *symlink* is then created +from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g., + + /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris + +The real-time clock, which keeps track of time when the computer is off, can be configured to either +be in UTC or in localtime by calling 'timedatectl set-local-rtc <false|true>'. The default is UTC. + +FILESYSTEMS[[F]] +---------------- +Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. + +INITRAMFS[[R]] +-------------- +The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf. + +PACKAGE MANAGER[[P]] +-------------------- +The package manager, pacman, is configured in /etc/pacman.conf. + +BOOTLOADER[[B]] +--------------- +GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg + +MODULES[[M]] +------------ +Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, +and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/. + +SEE ALSO +-------- + +systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5), +crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5) + +AUTHORS +------- +Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index a4a24e34f..cb9fec7ff 100644..100755 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false mail:x:8:12:mail:/var/spool/mail:/bin/false ftp:x:14:11:ftp:/srv/ftp:/bin/false http:x:33:33:http:/srv/http:/bin/false +uuidd:x:68:68:uuidd:/:/sbin/nologin nobody:x:99:99:nobody:/:/bin/false diff --git a/libre/filesystem/profile b/libre/filesystem/profile index 3bc22db9f..3bc22db9f 100644..100755 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf index cecafba03..cecafba03 100644..100755 --- a/libre/filesystem/resolv.conf +++ b/libre/filesystem/resolv.conf diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty index 5a2235ce7..5a2235ce7 100644..100755 --- a/libre/filesystem/securetty +++ b/libre/filesystem/securetty diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow index ccab68d33..5eff4935c 100644..100755 --- a/libre/filesystem/shadow +++ b/libre/filesystem/shadow @@ -4,4 +4,5 @@ daemon:x:14871:::::: mail:x:14871:::::: ftp:x:14871:::::: http:x:14871:::::: +uuidd:x:14871:::::: nobody:x:14871:::::: diff --git a/libre/filesystem/shells b/libre/filesystem/shells index 18c1aeffa..18c1aeffa 100644..100755 --- a/libre/filesystem/shells +++ b/libre/filesystem/shells |