From db082a31783c1dc9eadca601a0db486558c2e008 Mon Sep 17 00:00:00 2001 From: udeved Date: Tue, 7 Mar 2017 21:02:04 +0100 Subject: [PATCH 1/6] lxqt: use calamares pkg --- manjaro/lxqt/Packages-Live | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manjaro/lxqt/Packages-Live b/manjaro/lxqt/Packages-Live index 76b5df1..502aa61 100644 --- a/manjaro/lxqt/Packages-Live +++ b/manjaro/lxqt/Packages-Live @@ -1,6 +1,6 @@ -#calamares -calamares-dev +calamares +#calamares-dev >sonar sonar-calamares-branding KERNEL-broadcom-wl From fa6a880c6777ed261ebdde371802ab0a4a3bdc81 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 02:09:32 +0100 Subject: [PATCH 2/6] remove plymouth --- .buildiso | 1 - README.md | 3 --- community/architect/profile.conf | 2 -- community/bspwm/profile.conf | 2 -- community/budgie/Packages-Desktop | 2 -- community/budgie/profile.conf | 3 --- community/cinnamon/Packages-Desktop | 2 -- community/cinnamon/profile.conf | 3 --- community/deepin/Packages-Desktop | 2 -- community/deepin/profile.conf | 3 --- community/i3/profile.conf | 3 --- community/mate/Packages-Desktop | 4 +--- community/mate/profile.conf | 3 --- manjaro/gnome/Packages-Desktop | 2 -- manjaro/gnome/profile.conf | 3 --- manjaro/kde/Packages-Desktop | 2 -- manjaro/kde/profile.conf | 3 --- manjaro/netinstall/profile.conf | 3 --- manjaro/xfce/Packages-Desktop | 4 +--- manjaro/xfce/profile.conf | 3 --- shared/profile.conf.example | 3 --- sonar/gnome-edition/Packages-Desktop | 4 +--- sonar/gnome-edition/profile.conf | 3 --- sonar/mate-edition/Packages-Desktop | 1 - sonar/mate-edition/profile.conf | 3 --- 25 files changed, 3 insertions(+), 64 deletions(-) delete mode 120000 .buildiso diff --git a/.buildiso b/.buildiso deleted file mode 120000 index 800c1ef..0000000 --- a/.buildiso +++ /dev/null @@ -1 +0,0 @@ -repo_info \ No newline at end of file diff --git a/README.md b/README.md index be2e2b6..2dab706 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,6 @@ iso-profiles # nonfree xorg drivers # nonfree_mhwd="true" -# use plymouth -# plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/community/architect/profile.conf b/community/architect/profile.conf index 01ef16d..5af22e7 100644 --- a/community/architect/profile.conf +++ b/community/architect/profile.conf @@ -2,8 +2,6 @@ multilib='false' nonfree_mhwd="false" -plymouth_boot='false' - addgroups="power,disk,storage,network,lp,wheel" hostname="manjaro-architect" diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index 7c656da..01d3908 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -6,8 +6,6 @@ displaymanager="none" pxe_boot="false" -plymouth_boot="false" - nonfree_mhwd="false" multilib="false" diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop index 855518c..b3a3c87 100644 --- a/community/budgie/Packages-Desktop +++ b/community/budgie/Packages-Desktop @@ -93,8 +93,6 @@ sushi >systemd networkmanager >systemd ntp >systemd openssh ->systemd plymouth-legacy ->systemd plymouth-theme-manjaro-fancy-budgie terminus-font totem tracker diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index 79af4f8..739545d 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -23,9 +23,6 @@ displaymanager="lightdm" # nonfree xorg drivers nonfree_mhwd="false" -# use plymouth -# plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index 582b75b..3384b12 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -79,8 +79,6 @@ pamac pavucontrol >extra pidgin-libnotify >extra pix ->systemd plymouth-legacy ->systemd plymouth-theme-manjaro-cinnamon >extra poppler-data >extra powertop >extra pragha diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index cd7c102..dd18c68 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -26,9 +26,6 @@ displaymanager="lightdm" # nonfree xorg drivers nonfree_mhwd="true" -# use plymouth -plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index c82da3f..9b08ed2 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -82,8 +82,6 @@ ntp openresolv pamac patch ->systemd plymouth-legacy ->systemd plymouth-theme-manjaro-deepin-circle polkit-gnome poppler-data powertop diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index eeb93cb..1b4c3ff 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -26,9 +26,6 @@ displaymanager="lightdm" # nonfree xorg drivers # nonfree_mhwd="true" -# use plymouth -plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/community/i3/profile.conf b/community/i3/profile.conf index ad5490a..7a0186f 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -26,9 +26,6 @@ displaymanager="lightdm" # nonfree xorg drivers # nonfree_mhwd="true" -# use plymouth -plymouth_boot="false" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/community/mate/Packages-Desktop b/community/mate/Packages-Desktop index 932b856..19dcd62 100644 --- a/community/mate/Packages-Desktop +++ b/community/mate/Packages-Desktop @@ -19,7 +19,7 @@ mate-gtk3 #mate-extra-gtk3 galculator marco-gtk3 -brisk-menu +brisk-menu mate-notification-theme-slate mate-menu mate-control-center-gtk3 @@ -96,8 +96,6 @@ pulseaudio-zeroconf >systemd networkmanager >systemd ntp >systemd openssh -#>systemd plymouth-legacy -#plymouth-theme-manjaro-elegant terminus-font ttf-bitstream-vera ttf-dejavu diff --git a/community/mate/profile.conf b/community/mate/profile.conf index 1492774..6be9d51 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -26,9 +26,6 @@ displaymanager="lightdm" # nonfree xorg drivers # nonfree_mhwd="false" -# use plymouth -# plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 1157dd6..0a3e515 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -90,8 +90,6 @@ sushi >systemd networkmanager >systemd ntp >systemd openssh -#>systemd plymouth-legacy -#>systemd plymouth-theme-manjaro-gnome-17.0 terminus-font totem tracker diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index 1a0b9de..7cc9182 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -26,9 +26,6 @@ displaymanager="gdm" # nonfree xorg drivers # nonfree_mhwd="false" -# use plymouth - plymouth_boot="false" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index d313910..6102742 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -170,8 +170,6 @@ plasma5-themes-breath # Default >extra plasma5-themes-maia sddm-breath-theme # Default >extra sddm-maia-theme ->systemd plymouth-legacy ->systemd plymouth-theme-manjaro-elegant ## Better systray/notifications support >extra sni-qt # A Qt plugin that enables tray icons in qt4 applications diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index 376c7b3..5ef6c4b 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -13,9 +13,6 @@ displaymanager="sddm" # nonfree mhwd drivers # nonfree_mhwd="true" -# use plymouth; initcpio hook -plymouth_boot="false" - # use pxe boot; initcpio hook pxe_boot="false" diff --git a/manjaro/netinstall/profile.conf b/manjaro/netinstall/profile.conf index ec68dc0..481693f 100644 --- a/manjaro/netinstall/profile.conf +++ b/manjaro/netinstall/profile.conf @@ -13,9 +13,6 @@ displaymanager="sddm" # nonfree mhwd drivers nonfree_mhwd="false" -# use plymouth; initcpio hook -plymouth_boot="false" - # use pxe boot; initcpio hook pxe_boot="false" diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index b2b299d..efdef1c 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -187,8 +187,6 @@ xfce4-xkb-plugin gnome-icon-theme gnome-themes-standard gtk-theme-breath -#>systemd plymouth-legacy -#>systemd plymouth-theme-manjaro-elegant xcursor-simpleandsoft xcursor-vanilla-dmz-aa @@ -232,7 +230,7 @@ powertop # Optional dependencies engrampa p7zip # 7Z and ARJ archive support unace # ACE archive support -unrar # RAR archive support +unrar # RAR archive support ## Documentation manjaro-documentation diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index fae6d3a..6f3e3a5 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -13,9 +13,6 @@ displaymanager="lightdm" # nonfree mhwd drivers # nonfree_mhwd="true" -# use plymouth; initcpio hook -plymouth_boot="false" - # use pxe boot; initcpio hook pxe_boot="false" diff --git a/shared/profile.conf.example b/shared/profile.conf.example index e3ec438..d46eb32 100644 --- a/shared/profile.conf.example +++ b/shared/profile.conf.example @@ -26,9 +26,6 @@ # nonfree xorg drivers # nonfree_mhwd="true" -# use plymouth -# plymouth_boot="true" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/sonar/gnome-edition/Packages-Desktop b/sonar/gnome-edition/Packages-Desktop index 5b7934b..00b5c8f 100644 --- a/sonar/gnome-edition/Packages-Desktop +++ b/sonar/gnome-edition/Packages-Desktop @@ -122,8 +122,6 @@ sushi >systemd networkmanager >systemd ntp >systemd openssh -#>systemd plymouth-legacy -#>systemd plymouth-theme-sonar-elegant terminus-font totem tracker @@ -187,7 +185,7 @@ libyaml >extra gedit-plugins ->extra seahorse-nautilus +>extra seahorse-nautilus >extra simple-scan >extra nautilus-share >extra vinagre diff --git a/sonar/gnome-edition/profile.conf b/sonar/gnome-edition/profile.conf index 7cdedb8..0d54a28 100644 --- a/sonar/gnome-edition/profile.conf +++ b/sonar/gnome-edition/profile.conf @@ -26,9 +26,6 @@ displaymanager="gdm" # nonfree xorg drivers nonfree_mhwd="false" -# use plymouth -plymouth_boot="false" - # possible values: grub;systemd-boot # efi_boot_loader="grub" diff --git a/sonar/mate-edition/Packages-Desktop b/sonar/mate-edition/Packages-Desktop index 8883a6a..5de6a50 100644 --- a/sonar/mate-edition/Packages-Desktop +++ b/sonar/mate-edition/Packages-Desktop @@ -5,7 +5,6 @@ lightdm-gtk-greeter-settings mate-gtk3 mate-extra-gtk3 mate-desktop-gtk3 -plymouth-theme-sonar-elegant maia-wallpaper manjaro-artwork >extra gtk3-print-backends diff --git a/sonar/mate-edition/profile.conf b/sonar/mate-edition/profile.conf index f5e695c..73492ad 100644 --- a/sonar/mate-edition/profile.conf +++ b/sonar/mate-edition/profile.conf @@ -26,9 +26,6 @@ displaymanager="lightdm" # nonfree mhwd drivers nonfree_mhwd="false" -# use plymouth; initcpio hook -plymouth_boot="false" - # unset defaults to given value # efi_boot_loader="grub" From 4c1261ec88689f3bf1caeadd5f6b590d7281e629 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 02:10:22 +0100 Subject: [PATCH 3/6] set 0.15.0 --- repo_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_info b/repo_info index a7e383c..a551051 100644 --- a/repo_info +++ b/repo_info @@ -1 +1 @@ - 0.14.3 +0.15.0 From 09597afe643c3aed2cce9b1f25e32e45980c6d52 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 11:59:00 +0100 Subject: [PATCH 4/6] rm mkinitcpio.conf; supplied in mt-0.15 --- community/architect/mkinitcpio.conf | 1 - community/bspwm/mkinitcpio.conf | 1 - community/budgie/mkinitcpio.conf | 1 - community/cinnamon/mkinitcpio.conf | 1 - community/deepin/mkinitcpio.conf | 1 - community/i3/mkinitcpio.conf | 1 - community/mate/mkinitcpio.conf | 1 - manjaro/gnome/mkinitcpio.conf | 1 - manjaro/kde/mkinitcpio.conf | 1 - manjaro/lxqt/mkinitcpio.conf | 1 - manjaro/lxqt/profile.conf | 2 +- manjaro/netinstall/mkinitcpio.conf | 1 - manjaro/xfce/mkinitcpio.conf | 1 - shared/mkinitcpio.conf | 3 --- sonar/gnome-edition/mkinitcpio.conf | 1 - sonar/mate-edition/mkinitcpio.conf | 1 - 16 files changed, 1 insertion(+), 18 deletions(-) delete mode 120000 community/architect/mkinitcpio.conf delete mode 120000 community/bspwm/mkinitcpio.conf delete mode 120000 community/budgie/mkinitcpio.conf delete mode 120000 community/cinnamon/mkinitcpio.conf delete mode 120000 community/deepin/mkinitcpio.conf delete mode 120000 community/i3/mkinitcpio.conf delete mode 120000 community/mate/mkinitcpio.conf delete mode 120000 manjaro/gnome/mkinitcpio.conf delete mode 120000 manjaro/kde/mkinitcpio.conf delete mode 120000 manjaro/lxqt/mkinitcpio.conf delete mode 120000 manjaro/netinstall/mkinitcpio.conf delete mode 120000 manjaro/xfce/mkinitcpio.conf delete mode 100644 shared/mkinitcpio.conf delete mode 120000 sonar/gnome-edition/mkinitcpio.conf delete mode 120000 sonar/mate-edition/mkinitcpio.conf diff --git a/community/architect/mkinitcpio.conf b/community/architect/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/architect/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/bspwm/mkinitcpio.conf b/community/bspwm/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/bspwm/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/budgie/mkinitcpio.conf b/community/budgie/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/budgie/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/cinnamon/mkinitcpio.conf b/community/cinnamon/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/cinnamon/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/deepin/mkinitcpio.conf b/community/deepin/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/deepin/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/i3/mkinitcpio.conf b/community/i3/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/i3/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/community/mate/mkinitcpio.conf b/community/mate/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/community/mate/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/manjaro/gnome/mkinitcpio.conf b/manjaro/gnome/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/manjaro/gnome/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/manjaro/kde/mkinitcpio.conf b/manjaro/kde/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/manjaro/kde/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/manjaro/lxqt/mkinitcpio.conf b/manjaro/lxqt/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/manjaro/lxqt/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/manjaro/lxqt/profile.conf b/manjaro/lxqt/profile.conf index 0b82744..0956b5f 100644 --- a/manjaro/lxqt/profile.conf +++ b/manjaro/lxqt/profile.conf @@ -14,7 +14,7 @@ multilib="false" nonfree_mhwd="true" # use pxe boot; initcpio hooks -pxe_boot="false" +pxe_boot="true" # use core packages as defined in pkglist to use in basic profile # basic="false" diff --git a/manjaro/netinstall/mkinitcpio.conf b/manjaro/netinstall/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/manjaro/netinstall/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/manjaro/xfce/mkinitcpio.conf b/manjaro/xfce/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/manjaro/xfce/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/shared/mkinitcpio.conf b/shared/mkinitcpio.conf deleted file mode 100644 index 06a63cd..0000000 --- a/shared/mkinitcpio.conf +++ /dev/null @@ -1,3 +0,0 @@ -MODULES="loop dm-snapshot" -HOOKS="base udev memdisk miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block pcmcia filesystems keyboard keymap" -COMPRESSION="xz" diff --git a/sonar/gnome-edition/mkinitcpio.conf b/sonar/gnome-edition/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/sonar/gnome-edition/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file diff --git a/sonar/mate-edition/mkinitcpio.conf b/sonar/mate-edition/mkinitcpio.conf deleted file mode 120000 index d624606..0000000 --- a/sonar/mate-edition/mkinitcpio.conf +++ /dev/null @@ -1 +0,0 @@ -../../shared/mkinitcpio.conf \ No newline at end of file From ac7da24543e3c477ddee9717bf81d5c304f972b1 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 12:59:57 +0100 Subject: [PATCH 5/6] remove useless basic switch --- README.md | 3 --- community/bspwm/profile.conf | 3 --- community/budgie/profile.conf | 1 - community/cinnamon/profile.conf | 3 --- community/deepin/profile.conf | 3 --- community/i3/profile.conf | 3 --- community/mate/profile.conf | 3 --- manjaro/gnome/profile.conf | 3 --- manjaro/kde/profile.conf | 3 --- manjaro/lxqt/profile.conf | 3 --- manjaro/xfce/profile.conf | 3 --- shared/profile.conf.example | 3 --- sonar/gnome-edition/profile.conf | 3 --- sonar/mate-edition/profile.conf | 3 --- 14 files changed, 40 deletions(-) diff --git a/README.md b/README.md index 2dab706..6e7ef12 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,6 @@ iso-profiles # use pxe # pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index 01d3908..bbc284e 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -10,9 +10,6 @@ nonfree_mhwd="false" multilib="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile extra="true" diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index 739545d..c56b5f2 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -8,7 +8,6 @@ # use pxe pxe_boot="false" -# basic="true" # extra="false" ################ install ################ diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index dd18c68..f474e6f 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -8,9 +8,6 @@ # use pxe pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile extra="true" diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index 1b4c3ff..82652f8 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -8,9 +8,6 @@ # use pxe pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" diff --git a/community/i3/profile.conf b/community/i3/profile.conf index 7a0186f..e06f611 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -8,9 +8,6 @@ # use pxe # pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" diff --git a/community/mate/profile.conf b/community/mate/profile.conf index 6be9d51..45de70a 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -8,9 +8,6 @@ # use pxe # pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile extra="true" diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index 7cc9182..d36aa66 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -8,9 +8,6 @@ # use pxe # pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile extra="true" diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index 5ef6c4b..b229304 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -16,9 +16,6 @@ displaymanager="sddm" # use pxe boot; initcpio hook pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" extra="true" diff --git a/manjaro/lxqt/profile.conf b/manjaro/lxqt/profile.conf index 0956b5f..be8bfc0 100644 --- a/manjaro/lxqt/profile.conf +++ b/manjaro/lxqt/profile.conf @@ -16,9 +16,6 @@ nonfree_mhwd="true" # use pxe boot; initcpio hooks pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="true" diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index 6f3e3a5..6eef56c 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -16,9 +16,6 @@ displaymanager="lightdm" # use pxe boot; initcpio hook pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile extra="true" diff --git a/shared/profile.conf.example b/shared/profile.conf.example index d46eb32..b7339e3 100644 --- a/shared/profile.conf.example +++ b/shared/profile.conf.example @@ -8,9 +8,6 @@ # use pxe # pxe_boot="true" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" diff --git a/sonar/gnome-edition/profile.conf b/sonar/gnome-edition/profile.conf index 0d54a28..90f80da 100644 --- a/sonar/gnome-edition/profile.conf +++ b/sonar/gnome-edition/profile.conf @@ -8,9 +8,6 @@ multilib="true" # use pxe pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" diff --git a/sonar/mate-edition/profile.conf b/sonar/mate-edition/profile.conf index 73492ad..f8b99db 100644 --- a/sonar/mate-edition/profile.conf +++ b/sonar/mate-edition/profile.conf @@ -8,9 +8,6 @@ multilib="false" # use pxe boot; initcpio hook pxe_boot="false" -# use core packages as defined in pkglist to use in basic profile -# basic="false" - # use extra packages as defined in pkglist to activate a full profile # extra="false" From e03f870e8d3801e0787b4d45eab21ce5c728da76 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 17:37:29 +0100 Subject: [PATCH 6/6] rm netgroups setting --- README.md | 3 --- community/bspwm/profile.conf | 3 --- community/budgie/profile.conf | 3 --- community/cinnamon/profile.conf | 3 --- community/deepin/profile.conf | 3 --- community/i3/profile.conf | 3 --- community/mate/profile.conf | 3 --- manjaro/gnome/profile.conf | 3 --- manjaro/kde/profile.conf | 3 --- manjaro/netinstall/profile.conf | 6 +++--- manjaro/xfce/profile.conf | 3 --- shared/profile.conf.example | 3 --- sonar/gnome-edition/profile.conf | 3 --- sonar/mate-edition/profile.conf | 3 --- 14 files changed, 3 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 6e7ef12..f081fb4 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,6 @@ iso-profiles # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master" - # configure calamares to use chrootcfg instead of unpackfs; default: unpackfs # chrootcfg="false" diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index bbc284e..b137757 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -18,9 +18,6 @@ extra="true" # configure calamares for netinstall netinstall="true" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall" - # configure calamares to use chrootcfg instead of unpackfs chrootcfg="true" diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index c56b5f2..5436cab 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -28,9 +28,6 @@ displaymanager="lightdm" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index f474e6f..605cd48 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -29,9 +29,6 @@ nonfree_mhwd="true" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/oberon2007/installer-profiles/master/community" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index 82652f8..f8ab901 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -29,9 +29,6 @@ displaymanager="lightdm" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/community/i3/profile.conf b/community/i3/profile.conf index e06f611..122676e 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -29,9 +29,6 @@ displaymanager="lightdm" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/community/mate/profile.conf b/community/mate/profile.conf index 45de70a..d705a0e 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -29,9 +29,6 @@ displaymanager="lightdm" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index d36aa66..8aa8409 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -29,9 +29,6 @@ displaymanager="gdm" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index b229304..5668cbb 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -28,9 +28,6 @@ extra="true" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/manjaro/netinstall/profile.conf b/manjaro/netinstall/profile.conf index 481693f..9d231c8 100644 --- a/manjaro/netinstall/profile.conf +++ b/manjaro/netinstall/profile.conf @@ -16,6 +16,9 @@ nonfree_mhwd="false" # use pxe boot; initcpio hook pxe_boot="false" +# use extra packages as defined in pkglist to activate a full profile +# extra="true" + ################ install ################ # unset defaults to given value @@ -24,9 +27,6 @@ pxe_boot="false" # configure calamares for netinstall netinstall="true" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" - # configure calamares to use chrootcfg instead of unpackfs chrootcfg="true" diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index 6eef56c..99c6616 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -27,9 +27,6 @@ extra="true" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/shared/profile.conf.example b/shared/profile.conf.example index b7339e3..9b7e5fc 100644 --- a/shared/profile.conf.example +++ b/shared/profile.conf.example @@ -29,9 +29,6 @@ # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master" - # configure calamares to use chrootcfg instead of unpackfs; default: unpackfs # chrootcfg="false" diff --git a/sonar/gnome-edition/profile.conf b/sonar/gnome-edition/profile.conf index 90f80da..68428fc 100644 --- a/sonar/gnome-edition/profile.conf +++ b/sonar/gnome-edition/profile.conf @@ -29,9 +29,6 @@ nonfree_mhwd="false" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false" diff --git a/sonar/mate-edition/profile.conf b/sonar/mate-edition/profile.conf index f8b99db..2cad5ac 100644 --- a/sonar/mate-edition/profile.conf +++ b/sonar/mate-edition/profile.conf @@ -29,9 +29,6 @@ nonfree_mhwd="false" # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" - # configure calamares to use chrootcfg instead of unpackfs # chrootcfg="false"