| @@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="4.7" name="obs-worker" displayname="OBS_Worker">
+<image schemaversion="4.7" name="mini-image" displayname="mini-image">
<description type="system">
- <author>Adrian Schröter</author>
- <contact>adrian@suse.de</contact>
- <specification>Open Build Service(OBS) Worker</specification>
+ <author>Carsten Schoene</author>
+ <contact>cs@linux-administrator.com</contact>
+ <specification>mini-image</specification>
</description>
<preferences>
<type image="oem" filesystem="ext4" boot="oemboot/suse-12.1" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
<oemconfig>
<oem-swap>false</oem-swap>
- <oem-boot-title>OBS Worker</oem-boot-title>
+ <oem-boot-title>mini-image</oem-boot-title>
<oem-kiwi-initrd>true</oem-kiwi-initrd>
</oemconfig>
</type>
@@ -34,16 +34,13 @@
<repository type="rpm-md">
- <source path="obs://openSUSE:Tools/openSUSE_12.2"/>
- </repository>
- <repository type="rpm-md">
<source path="obs://openSUSE_12.2:Updates/oss"/>
</repository>
<repository type="rpm-md">
<source path="obs://openSUSE_12.2/oss"/>
</repository>
<packages type="image">
- <package name="sysvinit"/> <!-- OBS services are not running correctly with systemd -->
+ <package name="sysvinit"/>
<package name="openSUSE-release-mini"/> <!-- base system -->
<package name="bind-libs"/>
<package name="bind-utils"/>
@@ -78,9 +75,7 @@
<package name="adaptec-firmware"/>
<package name="openSUSE-build-key"/>
<package name="openSUSE-release"/>
- <package name="OBS-Addon-release"/>
- <package name="obs-worker"/> <!-- OBS worker -->
<package name="bsdtar"/> <!-- for safe built in kvm and xen -->
<package name="qemu-linux-user"/> <!-- for cross architecture build in chroot (initialization only) -->
|
| @@ -19,8 +19,8 @@
suseInsertService slpd
suseInsertService ntp
# OBS worker
-suseInsertService obsworker
-suseInsertService obsstoragesetup
+#suseInsertService obsworker
+#suseInsertService obsstoragesetup
#======================================
# SuSEconfig
@@ -51,9 +51,9 @@
sed -i 's/^id:5:initdefault:/id:3:initdefault:/' /etc/inittab
# enable autosetup
-sed -i 's,OBS_API_AUTOSETUP=.*,OBS_API_AUTOSETUP="yes",' /etc/sysconfig/obs-server
-sed -i 's,OBS_STORAGE_AUTOSETUP=.*,OBS_STORAGE_AUTOSETUP="yes",' /etc/sysconfig/obs-*
-sed -i 's,OBS_SETUP_WORKER_PARTITIONS=.*,OBS_SETUP_WORKER_PARTITIONS="use_obs_vg",' /etc/sysconfig/obs-*
+#sed -i 's,OBS_API_AUTOSETUP=.*,OBS_API_AUTOSETUP="yes",' /etc/sysconfig/obs-server
+#sed -i 's,OBS_STORAGE_AUTOSETUP=.*,OBS_STORAGE_AUTOSETUP="yes",' /etc/sysconfig/obs-*
+#sed -i 's,OBS_SETUP_WORKER_PARTITIONS=.*,OBS_SETUP_WORKER_PARTITIONS="use_obs_vg",' /etc/sysconfig/obs-*
# hardwired ntp server config, in case dhcp distribution of ntp config is not working
echo "" >> /etc/ntp.conf
@@ -73,9 +73,8 @@
#======================================
# Add Default Repositories
#--------------------------------------
-zypper ar http://download.opensuse.org/update/12.1/ openSUSE:12.1:Update
-zypper ar http://download.opensuse.org/repositories/openSUSE:12.1/standard openSUSE:12.1
-zypper ar http://download.opensuse.org/repositories/openSUSE:Tools/openSUSE_12.1 openSUSE:Tools
+zypper ar http://download.opensuse.org/update/12.2/ openSUSE:12.2:Update
+zypper ar http://download.opensuse.org/repositories/openSUSE:12.2/standard openSUSE:12.2
#======================================
# Umount kernel filesystems
|
