Skip to content

Commit

Permalink
Bring up to date with latest kiwi
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Dec 28, 2019
1 parent f417eed commit 12606b3
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 56 deletions.
39 changes: 0 additions & 39 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,15 @@ test -f /.profile && . /.profile
#--------------------------------------
echo "Configure image: [$kiwi_iname]..."

#======================================
# Mount system filesystems
#--------------------------------------
baseMount

#======================================
# Setup baseproduct link
#--------------------------------------
suseSetupProduct

#======================================
# Add missing gpg keys to rpm
#--------------------------------------
suseImportBuildKey

#======================================
# Activate services
#--------------------------------------
suseInsertService sshd
if [[ ${kiwi_type} =~ oem|vmx ]];then
suseInsertService grub_config
else
suseRemoveService grub_config
fi

#======================================
# Setup default target, multi-user
Expand Down Expand Up @@ -82,27 +67,3 @@ update-alternatives --auto libglx.so
#------------------------------------------
rm -rf /usr/share/doc/packages/*
rm -rf /usr/share/doc/manual/*
rm -rf /opt/kde*

#======================================
# only basic version of vim is
# installed; no syntax highlighting
#--------------------------------------
sed -i -e's/^syntax on/" syntax on/' /etc/vimrc

#======================================
# SuSEconfig
#--------------------------------------
suseConfig

#======================================
# Remove yast if not in use
#--------------------------------------
suseRemoveYaST

#======================================
# Umount kernel filesystems
#--------------------------------------
baseCleanMount

exit 0
7 changes: 2 additions & 5 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<image schemaversion="6.7" name="MythTV">
<image schemaversion="6.8" name="MythTV">
<description type="system">
<author>Paul Gardiner</author>
<contact>[email protected]</contact>
Expand All @@ -21,13 +21,13 @@
<bootloader-theme>openSUSE</bootloader-theme>
</preferences>
<preferences>
<type image="pxe" filesystem="squashfs" boot="netboot/suse-leap15.1"/>
<type image="vmx" filesystem="ext4" bootloader="grub2" kernelcmdline="splash" firmware="efi"/>
<type image="oem" filesystem="ext4" initrd_system="dracut" installiso="true" bootloader="grub2" kernelcmdline="splash" firmware="efi">
<oemconfig>
<oem-systemsize>2048</oem-systemsize>
<oem-swap>true</oem-swap>
<oem-device-filter>/dev/ram</oem-device-filter>
<oem-multipath-scan>false</oem-multipath-scan>
</oemconfig>
<machine memory="512" guestOS="suse" HWversion="4">
<vmdisk id="0" controller="ide"/>
Expand All @@ -54,9 +54,6 @@
<repository type="rpm-md" alias="nvidia" priority="5">
<source path="http://download.nvidia.com/opensuse/leap/15.1/"/>
</repository>
<strip type="delete">
<file name="/lib/modules/4.1.12-1-default/kernel/drivers/gpu/drm/nouveau/nouveau.ko"/>
</strip>
<packages type="image">
<package name="checkmedia"/>
<package name="patterns-openSUSE-base"/>
Expand Down
File renamed without changes.
Empty file removed root/.kiwi_grub_config.trigger
Empty file.
2 changes: 1 addition & 1 deletion root/etc/motd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
This is a kiwi-built MythTV frontend based on opensuse Leap 42.3
This is a kiwi-built MythTV frontend based on opensuse Leap 15.1

Have a lot of fun...
11 changes: 0 additions & 11 deletions root/usr/lib/systemd/system/grub_config.service

This file was deleted.

0 comments on commit 12606b3

Please sign in to comment.