Merge branch 'master' into i486

1 files changed, 14 insertions, 0 deletions

diff --git a/extra/linux-pae/linux.preset b/extra/linux-pae/linux.preset
new file mode 100644
index 00000000..66709a8c
--- /dev/null
+++ b/extra/linux-pae/linux.preset
@@ -0,0 +1,14 @@
+# mkinitcpio preset file for the '%PKGBASE%' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-%PKGBASE%"
+
+PRESETS=('default' 'fallback')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-%PKGBASE%.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+fallback_image="/boot/initramfs-%PKGBASE%-fallback.img"
+fallback_options="-S autodetect"