Merge branch 'master' of git.plutz.net:bootimage

diff --git a/config.mk b/config.mk
index fab729b0775e275c897bb2564c10c79d5cbcd41f..e9834029493d2311c295e38c3a191b9fb3f4e67a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -2,19 +2,19 @@ USER := user
 PASS := user
 GROUPS := sudo
 
-ARCH := amd64
+ARCH := i386
 CONFIG := config_base/
 
 ## Kernel Package is not in defaults
-PACKAGES := ${PACKAGES} linux-image-amd64
-# PACKAGES := ${PACKAGES} linux-image-686
+# PACKAGES := ${PACKAGES} linux-image-amd64
+PACKAGES := ${PACKAGES} linux-image-686
 
 ## Overall XFCE Desktop
-PACKAGES := ${PACKAGES} alsa-utils ark blueman breeze-icon-theme chromium cryptsetup cups-client dosfstools dvd+rw-tools dvdauthor eject exfat-fuse exfat-utils file firmware-linux-free gnome-keyring gparted gtk3-engines-breeze gvfs-backends gvfs-fuse gwenview k3b k3b-i18n kbd kde-l10n-de kde-spectacle kde-style-breeze kde-style-breeze-qt4 leafpad libgl1-mesa-dri locales lvm2 mdadm mesa-utils ntfs-3g okular pavucontrol plymouth plymouth-themes policykit-1 policykit-1-gnome pulseaudio pulseaudio-module-bluetooth recordmydesktop thunar-volman va-driver-all vdpau-driver-all vlc x11-xserver-utils x264 xauth xdotool xfce4 xfce4-terminal xfce4-whiskermenu-plugin xscreensaver xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all zenity
+# PACKAGES := ${PACKAGES} alsa-utils ark blueman breeze-icon-theme chromium cryptsetup cups-client dosfstools dvd+rw-tools dvdauthor eject exfat-fuse exfat-utils file firmware-linux-free gnome-keyring gparted gtk3-engines-breeze gvfs-backends gvfs-fuse gwenview k3b k3b-i18n kbd kde-l10n-de kde-spectacle kde-style-breeze kde-style-breeze-qt4 leafpad libgl1-mesa-dri locales lvm2 mdadm mesa-utils ntfs-3g okular pavucontrol plymouth plymouth-themes policykit-1 policykit-1-gnome pulseaudio pulseaudio-module-bluetooth recordmydesktop thunar-volman va-driver-all vdpau-driver-all vlc x11-xserver-utils x264 xauth xdotool xfce4 xfce4-terminal xfce4-whiskermenu-plugin xscreensaver xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all zenity
 
 ## Common heavy weight desktop applications
 #PACKAGES := ${PACKAGES} audacity blender clementine firefox-esr firefox-esr-l10n-de frei0r-plugins gimp hunspell hunspell-de-de hyphen-de inkscape kdenlive krita krita-l10n libreoffice libreoffice-gnome libreoffice-gtk libreoffice-l10n-de libreoffice-pdfimport libreoffice-style-breeze lightning marble thunderbird thunderbird-l10n-de
 
 ## Public Terminal / Personal Login
 # PACKAGES := ${PACKAGES} nodm
-PACKAGES := ${PACKAGES} lightdm network-manager network-manager-gnome 
+# PACKAGES := ${PACKAGES} lightdm network-manager network-manager-gnome 

diff --git a/partitions b/partitions
index 080380e3bbf4ec6d1a4c644743e3ce366459d9de..a02f341e5de61cf7785ede2949c5605de239a01a 100644 (file)
--- a/partitions
+++ b/partitions
@@ -2,5 +2,5 @@ label: gpt
 unit: sectors
 
 : start=2048, size=2G, type=1, attrs="LegacyBIOSBootable"
-: size=2G, type=19
+: size=3G, type=19
 : type=28

diff --git a/permissions.mk b/permissions.mk
index 628f88c87bc7a44cce17c55edab75a9e0a69363e..9409c35935ea1c966c992317fcbc072868dcd88a 100644 (file)
--- a/permissions.mk
+++ b/permissions.mk
@@ -6,6 +6,7 @@ permissions: ${CONFIG} .FORCE
        -chmod -R a+rX config_*/etc/
        -chmod -R a+rX config_*/var/
        -chmod -R a+rX config_*/lib/
+       -chmod -R a+rX config_*/usr/
        -chmod 0700 config_*/var/lib/polkit-1/
        -chmod 0750 config_*/root/
        -chmod 0700 config_*/root/.ssh/