diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-17 15:20:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-17 15:20:59 +0000 |
| commit | 8695c5cee37ce961c6b6f696a580b040970b6bef (patch) | |
| tree | 00cc6be3c97731170662dc23468e7f3accfde224 | |
| parent | afad71279247d7fdc86f6f2b9ad4f9f10e3dbc55 (diff) | |
| download | aports-8695c5cee37ce961c6b6f696a580b040970b6bef.tar.bz2 aports-8695c5cee37ce961c6b6f696a580b040970b6bef.tar.xz | |
main/alpine-baselayout: mount /media/usb as ro by default
People who wants it rw should edit /etc/fstab
ref #1480
3 files changed, 30 insertions, 33 deletions
diff --git a/main/alpine-baselayout/0001-blacklist-viafb-and-e_powersaver.patch b/main/alpine-baselayout/0001-blacklist-viafb-and-e_powersaver.patch deleted file mode 100644 index a1d51afe26..0000000000 --- a/main/alpine-baselayout/0001-blacklist-viafb-and-e_powersaver.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3a61e3d30e7291c11d9bfa3dfcab499e31c9138b Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 8 Nov 2011 15:42:46 +0000 -Subject: [PATCH] blacklist viafb and e_powersaver - ---- - blacklist.conf | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/blacklist.conf b/blacklist.conf -index 167fc31..9e0cfd6 100644 ---- a/blacklist.conf -+++ b/blacklist.conf -@@ -55,6 +55,7 @@ blacklist sstfb - blacklist neofb - blacklist tridentfb - blacklist tdfxfb -+blacklist viafb - blacklist virgefb - blacklist vga16fb - blacklist matroxfb_base -@@ -69,3 +70,5 @@ blacklist hfcmulti - blacklist hfcpci - blacklist hfcsusb - -+# blacklist C7 cpu freq. use acpi-cpufreq instead -+blacklist e_powersaver --- -1.7.7.2 - diff --git a/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch b/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch new file mode 100644 index 0000000000..af8b1944ef --- /dev/null +++ b/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch @@ -0,0 +1,22 @@ +From 0c788d44a3acd686019bd7a276fca014b0aac584 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 17 Dec 2012 15:17:22 +0000 +Subject: [PATCH] mount /media/usb as ro by default + +--- + fstab | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fstab b/fstab +index 83743d1..d1202d5 100644 +--- a/fstab ++++ b/fstab +@@ -1,4 +1,4 @@ + /dev/cdrom /media/cdrom iso9660 noauto,ro 0 0 + /dev/fd0 /media/floppy vfat noauto 0 0 +-/dev/usbdisk /media/usb vfat noauto 0 0 ++/dev/usbdisk /media/usb vfat noauto,ro 0 0 + usbfs /proc/bus/usb usbfs noauto 0 0 +-- +1.8.0.2 + diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index d50f84c4a0..a0e78d5323 100644 --- a/main/alpine-baselayout/APKBUILD +++ b/main/alpine-baselayout/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout pkgver=2.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Alpine base dir structure and init scripts" url=http://git.alpinelinux.org/cgit/alpine-baselayout depends= options="!fhs" install="$pkgname.pre-upgrade $pkgname.post-upgrade" source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-blacklist-viafb-and-e_powersaver.patch + 0001-mount-media-usb-as-ro-by-default.patch " arch="all" license=GPL-2 @@ -16,6 +16,11 @@ license=GPL-2 _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -34,4 +39,4 @@ package() { echo "blacklist microcode" > "$pkgdir"/etc/modprobe.d/microcode.conf } md5sums="225dbf5b50ae6d3d188ff92c5746bc36 alpine-baselayout-2.2.0.tar.bz2 -3e219db536b13811c34e03c9c32229cb 0001-blacklist-viafb-and-e_powersaver.patch" +0619f806d91a5293a95debe9fb0124b5 0001-mount-media-usb-as-ro-by-default.patch" |