|
[-]
[+]
|
Changed |
j0ke-worker.changes
|
|
|
|
[-]
[+]
|
Changed |
j0ke-worker.spec
^
|
|
|
|
[-]
[+]
|
Changed |
obsworker
^
|
| @@ -170,13 +170,32 @@
OBS_BASE_LV_SIZE=$((((${OBS_CACHE_SIZE} + 500)) * 2))
lvm lvcreate -n base -L ${OBS_BASE_LV_SIZE}M abuild
- mkfs.xfs -q -f /dev/abuild/cache
- mkdir -p ${OBS_CACHE_DIR}
- mount -t xfs /dev/abuild/cache ${OBS_CACHE_DIR}
+ if [ -n "`grep ^xfs /proc/modules`" ] ; then
+ mkfs.xfs -q -f /dev/abuild/cache
+ mkdir -p ${OBS_CACHE_DIR}
+ mount -t xfs /dev/abuild/cache ${OBS_CACHE_DIR}
+
+ mkfs.xfs -q -f /dev/abuild/base
+ mkdir -p ${OBS_WORKER_DIRECTORY}
+ mount -t xfs /dev/abuild/base ${OBS_WORKER_DIRECTORY}
+ elif [ -n "`grep ^ext4 /proc/modules`" ] ; then
+ mkfs.ext4 -q /dev/abuild/cache
+ mkdir -p ${OBS_CACHE_DIR}
+ mount -t ext4 /dev/abuild/cache ${OBS_CACHE_DIR}
+
+ mkfs.ext4 -q /dev/abuild/base
+ mkdir -p ${OBS_WORKER_DIRECTORY}
+ mount -t ext4 /dev/abuild/base ${OBS_WORKER_DIRECTORY}
+ else
+ mkfs.ext3 -q /dev/abuild/cache
+ mkdir -p ${OBS_CACHE_DIR}
+ mount -t ext3 /dev/abuild/cache ${OBS_CACHE_DIR}
+
+ mkfs.ext3 -q /dev/abuild/base
+ mkdir -p ${OBS_WORKER_DIRECTORY}
+ mount -t ext3 /dev/abuild/base ${OBS_WORKER_DIRECTORY}
+ fi
- mkfs.xfs -q -f /dev/abuild/base
- mkdir -p ${OBS_WORKER_DIRECTORY}
- mount -t xfs /dev/abuild/base ${OBS_WORKER_DIRECTORY}
else
for a in `losetup -a|awk -F: '{print $1}'` ; do losetup -d $a ; done
fi
|
