diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-26 21:53:52 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-26 21:53:52 -0500 |
commit | 7275399e96c64abc852c3746aa58d10bee8a5a44 (patch) | |
tree | a798ae34656585ec83f390dac95382ccc303919c /libre/filesystem | |
parent | 4bfc44a83c098d0f6d731b855541140fac36b8aa (diff) | |
parent | 31763e92611731c859ccbe4e97019afabb5ef91e (diff) | |
download | abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.tar.gz abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.tar.bz2 abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre
Diffstat (limited to 'libre/filesystem')
-rw-r--r-- | libre/filesystem/PKGBUILD | 22 | ||||
-rw-r--r-- | libre/filesystem/filesystem.install | 3 | ||||
-rw-r--r-- | libre/filesystem/issue | 1 | ||||
-rw-r--r-- | libre/filesystem/modprobe.d.usb-load-ehci-first | 4 |
4 files changed, 13 insertions, 17 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index ea1e0e4f9..733d34aa3 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140217 2011-10-09 23:32:13Z dreisner $ +# $Id: PKGBUILD 147201 2012-01-24 06:36:12Z bisson $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=filesystem -pkgver=2011.10 -pkgrel=1 +pkgver=2011.12 +pkgrel=2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -19,7 +19,7 @@ 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' - '140787c0dc6f3f1272cfd381b92b0155' + '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' @@ -34,7 +34,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a' '22518e922891f9359f971f4f5b4e793c' 'd2dc4e39dbdea75b107f91789e3274ab' 'f3b6ae7db8adffaaa4bffc6099dcbd50' - '8098ffd9fbf890468d3198277596b85a') + 'a8a962370cd0128465d514e6a1f74130') package() { cd ${srcdir} @@ -56,6 +56,7 @@ package() { for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do install -m644 ${srcdir}/${f} ${pkgdir}/etc/ done + ln -s /proc/self/mounts ${pkgdir}/etc/mtab for f in gshadow shadow crypttab; do install -m600 ${srcdir}/${f} ${pkgdir}/etc/ done @@ -63,16 +64,15 @@ package() { install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf # setup /var - for d in cache/man local opt run log/old lib/misc empty; do + for d in cache/man local opt log/old lib/misc empty; do install -d -m755 ${pkgdir}/var/${d} done - install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail} + install -d -m1777 ${pkgdir}/var/{tmp,spool/mail} # allow setgid games to write scores install -d -m775 -g games ${pkgdir}/var/games - ln -s spool/mail ${pkgdir}/var/mail - # prevent pacman from removing directory (FS#16886) - touch ${pkgdir}/var/empty/.keep - + ln -s /var/spool/mail ${pkgdir}/var/mail + ln -s /run ${pkgdir}/var/run + ln -s /run/lock ${pkgdir}/var/lock # # setup /usr hierarchy diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 640cd5c1d..0ecc27e65 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -1,9 +1,6 @@ post_install() { [ -f var/log/lastlog ] || : >var/log/lastlog [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/run/utmp ] || : >var/run/utmp - chown root:20 var/run/utmp - chmod 664 var/run/utmp [ -f var/log/btmp ] || (: >var/log/btmp && bin/chmod 600 var/log/btmp) # workaround for bug #7194 # readded due to bug #9465 diff --git a/libre/filesystem/issue b/libre/filesystem/issue index 323abdbf7..b001c55dd 100644 --- a/libre/filesystem/issue +++ b/libre/filesystem/issue @@ -1,3 +1,2 @@ -[H[2J Parabola GNU/Linux-libre \r (\n) (\l) diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first index 3b5db0e7a..947379411 100644 --- a/libre/filesystem/modprobe.d.usb-load-ehci-first +++ b/libre/filesystem/modprobe.d.usb-load-ehci-first @@ -1,2 +1,2 @@ -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS +softdep ohci_hcd pre: ehci_hcd +softdep uhci_hcd pre: ehci_hcd |