Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=f4e9973f41fa863a38c5af50749ad1c573d3090b
commit f4e9973f41fa863a38c5af50749ad1c573d3090b Author: crazy <[email protected]> Date: Tue Oct 24 12:58:38 2017 +0200 packages: more work - added FVBE_ROOTFS_PACKAGES_GNOME_APPS - added openssh and wget to base - remove http fake server stuff - added Fixme for welcome app diff --git a/bin/fvbe-make-iso b/bin/fvbe-make-iso index 455dfc3..27d72b0 100755 --- a/bin/fvbe-make-iso +++ b/bin/fvbe-make-iso @@ -200,6 +200,7 @@ fvbe_create_users() { fvbe_plain_msg "Fixing 'LIVE' users home.." cp -ra live ${FVBE_ROOT}/home/ + ## Fixme need welcome app mkdir -p ${FVBE_ROOT}/home/live/.config/autostart fvbe_chroot "cp -r /home/live/Desktop/calamares-frugalware.desktop /home/live/.config/autostart/calamares-frugalware.desktop" fvbe_chroot "/usr/bin/chown -R live.users /home/live" @@ -416,6 +417,7 @@ fi # FVBE_ROOTFS_PACKAGES_PLASMA # FVBE_ROOTFS_PACKAGES_PLASMA_APPS # FVBE_ROOTFS_PACKAGES_GNOME +# FVBE_ROOTFS_PACKAGES_GNOME_APPS # FVBE_ROOTFS_PACKAGES_E # FVBE_ROOTFS_PACKAGES_LUMINA # FVBE_ROOTFS_PACKAGES_i3 @@ -438,6 +440,7 @@ _FVBE_PACKAGES=( "${FVBE_ROOTFS_PACKAGES_MULTIMEDIA[@]}" "${FVBE_ROOTFS_PACKAGES_INTERNET[@]}" "${FVBE_ROOTFS_PACKAGES_I18N[@]}" "${FVBE_ROOTFS_PACKAGES_VIRTUAL[@]}" "${FVBE_ROOTFS_PACKAGES_EXTRA[@]}" "${FVBE_ROOTFS_PACKAGES_X11[@]}" + "${FVBE_ROOTFS_PACKAGES_GNOME_APPS[@]}" ) case ${FVBE_ISO_TYPE} in @@ -519,12 +522,9 @@ fvbe_calamares_files ## copy /boot files over fvbe_cache_files -## disable lvm stuff we don't really support that +## disable lvm we don't really support that from installer fvbe_chroot "/bin/systemctl disable lvm" -## enable lighttpd -fvbe_chroot "/bin/systemctl enable lighttpd" - ## wipe files from live fvbe_wipe_files_from_liveiso ## umount diff --git a/calamares/netinstall/packages.yaml b/calamares/netinstall/packages.yaml index 01fb2f0..bc7af85 100644 --- a/calamares/netinstall/packages.yaml +++ b/calamares/netinstall/packages.yaml @@ -5,6 +5,8 @@ critical: true packages: - base + - openssh + - wget - name: "Plasma Desktop" description: "Minimal Plasma5 Desktop" hidden: false diff --git a/fvbe-packages.conf b/fvbe-packages.conf index f382c36..fff390f 100644 --- a/fvbe-packages.conf +++ b/fvbe-packages.conf @@ -6,10 +6,10 @@ ### BASE ### ( used for live and as fpm ) -FVBE_ROOTFS_PACKAGES_BASE="base dracut gnupg2 pkgconfig" +FVBE_ROOTFS_PACKAGES_BASE="base dracut gnupg2 pkgconfig openssh wget" ## LIVE package -FVBE_ROOTFS_PACKAGES_LIVE_BASIC="virtualbox-guest-additions calamares-frugalware xf86-video-vmware wget openssh lighttpd" +FVBE_ROOTFS_PACKAGES_LIVE_BASIC="virtualbox-guest-additions calamares-frugalware xf86-video-vmware wget openssh" FVBE_ROOTFS_PACKAGES_LIVE_PLASMA="sddm plasma konsole dolphin partitionmanager spectacle kate ark qupzilla konversation" ## From here on define packages are installed as 'fpm' on the iso @@ -28,6 +28,7 @@ FVBE_ROOTFS_PACKAGES_PLASMA_APPS="kdeconnect ktp-accounts-kcm ktp-desktop-applet ### GNOME ### FVBE_ROOTFS_PACKAGES_GNOME="gdm gnome cups bluez" +FVBE_ROOTFS_PACKAGES_GNOME_APPS="" ### OFFICE ### FVBE_ROOTFS_PACKAGES_OFFICE="libreoffice libreoffice-gnome" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
