2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-12 15:51:30 +00:00

Merge pull request #6690 from gurevichmark/squashfs_overlay2

Do not use modinfo to test module availability
This commit is contained in:
cxhong
2020-05-04 17:32:02 -04:00
committed by GitHub
6 changed files with 6 additions and 12 deletions

View File

@ -52,12 +52,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"

View File

@ -62,12 +62,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"

View File

@ -69,12 +69,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"

View File

@ -69,12 +69,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"

View File

@ -65,12 +65,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"

View File

@ -34,12 +34,11 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
modinfo overlay
modprobe overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
mkdir -p /rw/upper
mkdir -p /rw/work
modprobe overlay
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"