-
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes for Kitten and 10 Beta images: (#83)
* Enable "Install to Hard Drive" functionality for Kitten 10 with ALBS packages * Set wallpapers for Kitten and 10 KDE images * Install OpenVPN into GNOME, Mini, KDE; Kitten and 10 Beta images; x86_64 (v3 only) and aarch64 * Remove ALBS repository from which almalinux-beckgrounds-extra was installed. The package in in public now Replace live installer icon for the application and welcome center * Remove ALBS repository from which anaconda packages were installed. The package in in public now * Kitten and 10.0 Beta KDE images: do not create useless symlinks
- Loading branch information
Showing
16 changed files
with
112 additions
and
283 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,63 +84,19 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \ | |
| # See bug 1317709 | ||
| rm -f /boot/*-rescue* | ||
| # TODO: almalinux-backgrounds-extras package looks good, remove inline method | ||
| # on next build | ||
| generateKDEWallpapers() { | ||
| # Declare an array for background types | ||
| declare -a bgtypes=("dark" "light" "abstract-dark" "abstract-light" "mountains-dark" "mountains-white" "waves-dark" "waves-light" "waves-sunset") | ||
| # Declare an array for background sizes | ||
| declare -a sizes=("1800x1440.jpg" "2048x1536.jpg" "2560x1080.jpg" "2560x1440.jpg" "2560x1600.jpg" "3440x1440.jpg") | ||
| ## Loop through the above array(s) types and sizes to create links and metadata | ||
| for bg in "${bgtypes[@]}" | ||
| do | ||
| echo "Processing 'Alma-"$bg"' background" | ||
| # Remove any old folders and create new structure | ||
| rm -rf /usr/share/wallpapers/Alma-$bg* | ||
| mkdir -p /usr/share/wallpapers/Alma-$bg/contents/images/ | ||
| # creae sym link for all sizes | ||
| for size in "${sizes[@]}" | ||
| do | ||
| ln -s /usr/share/backgrounds/Alma-$bg-$size /usr/share/wallpapers/Alma-$bg/contents/images/$size | ||
| done | ||
| # Create metadata file to make Desktop Wallpaper application happy | ||
| # Move this to pre-created files in repo to give support to other languages | ||
| # This is quick hack for time being. | ||
| cat > /usr/share/wallpapers/Alma-$bg/metadata.desktop <<FOE | ||
| [Desktop Entry] | ||
| Name=AlmaLinux $bg | ||
| X-KDE-PluginInfo-Author=Bala Raman | ||
| [email protected] | ||
| X-KDE-PluginInfo-Name=Alma-$bg | ||
| X-KDE-PluginInfo-Version=0.1.0 | ||
| X-KDE-PluginInfo-Website=https://almalinux.org | ||
| X-KDE-PluginInfo-Category= | ||
| X-KDE-PluginInfo-Depends= | ||
| X-KDE-PluginInfo-License=CC-BY-SA | ||
| X-KDE-PluginInfo-EnabledByDefault=true | ||
| X-Plasma-API=5.0 | ||
| FOE | ||
| done | ||
| } | ||
| # call function to create wallpapers | ||
| # generateKDEWallpapers | ||
| # Very ODD fix to get Alma background, find alternative | ||
| rm -rf /usr/share/wallpapers/Fedora | ||
| ln -s Alma-mountains-white /usr/share/wallpapers/Fedora | ||
| # background end | ||
| # Update default theme - this has to stay KS | ||
| # Hack KDE Fedora package starts. TODO: need almalinux-kde-fix package | ||
| sed -i 's/defaultWallpaperTheme=Fedora/defaultWallpaperTheme=Alma-mountains-white/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultFileSuffix=.png/defaultFileSuffix=.jpg/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultWidth=1920/defaultWidth=2048/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultHeight=1080/defaultHeight=1536/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| # Update KInfocenter | ||
| sed -i 's/pixmaps\/system-logo-white.png/icons\/hicolor\/256x256\/apps\/fedora-logo-icon.png/' /etc/xdg/kcm-about-distrorc | ||
| sed -i 's/http:\/\/fedoraproject.org/https:\/\/almalinux.org/' /etc/xdg/kcm-about-distrorc | ||
| # Hack KDE Fedora package ends | ||
| # Theme wallpapers | ||
| rm -f /usr/share/wallpapers/Fedora | ||
| ln -s Alma-default /usr/share/wallpapers/Fedora | ||
| # Locked screen wallpapers | ||
| mkdir -p /home/liveuser/.config && chown -R liveuser:liveuser /home/liveuser/.config | ||
| cat <<'EOF'>/home/liveuser/.config/kscreenlockerrc | ||
| [Greeter][Wallpaper][org.kde.image][General] | ||
| Image=/usr/share/wallpapers/Alma-default/ | ||
| PreviewImage=/usr/share/wallpapers/Alma-default/ | ||
| EOF | ||
| # Replace live installer icon for the application and welcome center | ||
| sed -i "s/Icon=.*$/Icon=\/usr\/share\/icons\/hicolor\/scalable\/apps\/org.fedoraproject.AnacondaInstaller.svg/g" \ | ||
| /usr/share/applications/liveinst.desktop | ||
| # Disable network service here, as doing it in the services line | ||
| # fails due to RHBZ #1369794 | ||
|
|
@@ -197,8 +153,7 @@ kernel-modules-extra | |
| # The point of a live image is to install | ||
| anaconda | ||
| anaconda-install-env-deps | ||
| # TODO: "Install to Hard Drive" temporary disabled because of https://github.com/rhinstaller/anaconda/discussions/5997 | ||
| #anaconda-live | ||
| anaconda-live | ||
| @anaconda-tools | ||
| # Anaconda has a weak dep on this and we don't want it on livecds, see | ||
| # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD | ||
|
|
@@ -243,6 +198,10 @@ firefox | |
| # Additional packages that are not default in kde-* groups, but useful | ||
| fuse | ||
|
|
||
| # OpenVPN | ||
| openvpn | ||
| NetworkManager-openvpn | ||
|
|
||
| ### space issues | ||
| -ktorrent # kget has also basic torrent features (~3 megs) | ||
| -digikam # digikam has duplicate functionality with gwenview (~28 megs) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,63 +84,19 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \ | |
| # See bug 1317709 | ||
| rm -f /boot/*-rescue* | ||
| # TODO: almalinux-backgrounds-extras package looks good, remove inline method | ||
| # on next build | ||
| generateKDEWallpapers() { | ||
| # Declare an array for background types | ||
| declare -a bgtypes=("dark" "light" "abstract-dark" "abstract-light" "mountains-dark" "mountains-white" "waves-dark" "waves-light" "waves-sunset") | ||
| # Declare an array for background sizes | ||
| declare -a sizes=("1800x1440.jpg" "2048x1536.jpg" "2560x1080.jpg" "2560x1440.jpg" "2560x1600.jpg" "3440x1440.jpg") | ||
| ## Loop through the above array(s) types and sizes to create links and metadata | ||
| for bg in "${bgtypes[@]}" | ||
| do | ||
| echo "Processing 'Alma-"$bg"' background" | ||
| # Remove any old folders and create new structure | ||
| rm -rf /usr/share/wallpapers/Alma-$bg* | ||
| mkdir -p /usr/share/wallpapers/Alma-$bg/contents/images/ | ||
| # creae sym link for all sizes | ||
| for size in "${sizes[@]}" | ||
| do | ||
| ln -s /usr/share/backgrounds/Alma-$bg-$size /usr/share/wallpapers/Alma-$bg/contents/images/$size | ||
| done | ||
| # Create metadata file to make Desktop Wallpaper application happy | ||
| # Move this to pre-created files in repo to give support to other languages | ||
| # This is quick hack for time being. | ||
| cat > /usr/share/wallpapers/Alma-$bg/metadata.desktop <<FOE | ||
| [Desktop Entry] | ||
| Name=AlmaLinux $bg | ||
| X-KDE-PluginInfo-Author=Bala Raman | ||
| [email protected] | ||
| X-KDE-PluginInfo-Name=Alma-$bg | ||
| X-KDE-PluginInfo-Version=0.1.0 | ||
| X-KDE-PluginInfo-Website=https://almalinux.org | ||
| X-KDE-PluginInfo-Category= | ||
| X-KDE-PluginInfo-Depends= | ||
| X-KDE-PluginInfo-License=CC-BY-SA | ||
| X-KDE-PluginInfo-EnabledByDefault=true | ||
| X-Plasma-API=5.0 | ||
| FOE | ||
| done | ||
| } | ||
| # call function to create wallpapers | ||
| # generateKDEWallpapers | ||
| # Very ODD fix to get Alma background, find alternative | ||
| rm -rf /usr/share/wallpapers/Fedora | ||
| ln -s Alma-mountains-white /usr/share/wallpapers/Fedora | ||
| # background end | ||
| # Update default theme - this has to stay KS | ||
| # Hack KDE Fedora package starts. TODO: need almalinux-kde-fix package | ||
| sed -i 's/defaultWallpaperTheme=Fedora/defaultWallpaperTheme=Alma-mountains-white/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultFileSuffix=.png/defaultFileSuffix=.jpg/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultWidth=1920/defaultWidth=2048/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| sed -i 's/defaultHeight=1080/defaultHeight=1536/' /usr/share/plasma/desktoptheme/default/metadata.desktop | ||
| # Update KInfocenter | ||
| sed -i 's/pixmaps\/system-logo-white.png/icons\/hicolor\/256x256\/apps\/fedora-logo-icon.png/' /etc/xdg/kcm-about-distrorc | ||
| sed -i 's/http:\/\/fedoraproject.org/https:\/\/almalinux.org/' /etc/xdg/kcm-about-distrorc | ||
| # Hack KDE Fedora package ends | ||
| # Theme wallpapers | ||
| rm -f /usr/share/wallpapers/Fedora | ||
| ln -s Alma-default /usr/share/wallpapers/Fedora | ||
| # Locked screen wallpapers | ||
| mkdir -p /home/liveuser/.config && chown -R liveuser:liveuser /home/liveuser/.config | ||
| cat <<'EOF'>/home/liveuser/.config/kscreenlockerrc | ||
| [Greeter][Wallpaper][org.kde.image][General] | ||
| Image=/usr/share/wallpapers/Alma-default/ | ||
| PreviewImage=/usr/share/wallpapers/Alma-default/ | ||
| EOF | ||
| # Replace live installer icon for the application and welcome center | ||
| sed -i "s/Icon=.*$/Icon=\/usr\/share\/icons\/hicolor\/scalable\/apps\/org.fedoraproject.AnacondaInstaller.svg/g" \ | ||
| /usr/share/applications/liveinst.desktop | ||
| # Disable network service here, as doing it in the services line | ||
| # fails due to RHBZ #1369794 | ||
|
|
@@ -197,8 +153,7 @@ kernel-modules-extra | |
| # The point of a live image is to install | ||
| anaconda | ||
| anaconda-install-env-deps | ||
| # TODO: "Install to Hard Drive" temporary disabled because of https://github.com/rhinstaller/anaconda/discussions/5997 | ||
| #anaconda-live | ||
| anaconda-live | ||
| @anaconda-tools | ||
| # Anaconda has a weak dep on this and we don't want it on livecds, see | ||
| # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD | ||
|
|
@@ -246,6 +201,10 @@ firefox | |
| # Additional packages that are not default in kde-* groups, but useful | ||
| fuse | ||
|
|
||
| # OpenVPN | ||
| openvpn | ||
| NetworkManager-openvpn | ||
|
|
||
| ### space issues | ||
| -ktorrent # kget has also basic torrent features (~3 megs) | ||
| -digikam # digikam has duplicate functionality with gwenview (~28 megs) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.