xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-13 09:50:19 +00:00
Code Issues Releases Wiki Activity

enhance packimage -m txc (#1602)

Browse Source
This commit is contained in:
penguhyang
2016-08-02 16:45:31 +08:00
committed by yangsong
parent 2d6374f6b8
commit 5cd203cdf5
35 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man1/packimage.1.rst
View File

@ -62,7 +62,7 @@ OPTIONS
\ **-a**\ Architecture (ppc64,x86_64,etc)
\ **-m**\ Method (cpio,txc,squashfs, default is cpio)
\ **-m**\ Archive Method (cpio,tar,squashfs, default is cpio)
************

2
xCAT-client/pods/man1/packimage.1.pod
View File

@ -36,7 +36,7 @@ B<-p> Profile (compute,service)
B<-a> Architecture (ppc64,x86_64,etc)
B<-m> Method (cpio,txc,squashfs, default is cpio)
B<-m> Archive Method (cpio,tar,squashfs, default is cpio)
=head1 RETURN VALUE

4
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -464,7 +464,7 @@ sub mknetboot
$platform = xCAT_plugin::anaconda::getplatform($osver);
my $suffix = 'gz';
$suffix = 'sfs' if (-r "$rootimgdir/rootimg.sfs");
$suffix = 'txz' if (-r "$rootimgdir/rootimg.txz");
$suffix = 'tgz' if (-r "$rootimgdir/rootimg.tgz");
# statelite images are not packed.
if ($statelite) {
@ -513,7 +513,7 @@ sub mknetboot
copy("$rootimgdir/initrd.gz", "$rootimgdir/initrd-stateless.gz");
}
}
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.txz" or -r "$rootimgdir/rootimg.sfs") {
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.tgz" or -r "$rootimgdir/rootimg.sfs") {
$callback->({
error => ["No packed image for platform $osver, architecture $arch, and profile $profile found at $rootimgdir/rootimg.gz or $rootimgdir/rootimg.sfs on $myname, please run packimage (e.g. packimage -o $osver -p $profile -a $arch"],
errorcode => [1] });

4
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -1172,7 +1172,7 @@ sub mknetboot
$platform = xCAT_plugin::debian::getplatform($osver);
my $suffix = 'gz';
$suffix = 'sfs' if (-r "$rootimgdir/rootimg.sfs");
$suffix = 'txz' if (-r "$rootimgdir/rootimg.txz");
$suffix = 'tgz' if (-r "$rootimgdir/rootimg.tgz");
# statelite images are not packed.
if ($statelite) {
@ -1222,7 +1222,7 @@ sub mknetboot
copy("$rootimgdir/initrd.gz", "$rootimgdir/initrd-stateless.gz");
}
}
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.txz" or -r "$rootimgdir/rootimg.sfs") {
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.tgz" or -r "$rootimgdir/rootimg.sfs") {
$callback->({
error => ["No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage (e.g. packimage -o $osver -p $profile -a $arch"],
errorcode => [1] });

32
xCAT-server/lib/xcat/plugins/packimage.pm
View File

@ -429,7 +429,7 @@ sub process_request {
$compress = "pigz";
}
if (!$exlistloc) {
$excludestr = "find . -xdev |cpio -H newc -o | $compress -c - > ../rootimg.gz";
$excludestr = "find . -xdev -print0 | cpio -H newc -o -0 | $compress -c - > ../rootimg.gz";
} else {
chdir("$rootimg_dir");
system("$excludestr >> $xcat_packimg_tmpfile");
@ -439,22 +439,29 @@ sub process_request {
$excludestr = "cat $xcat_packimg_tmpfile|cpio -H newc -o | $compress -c - > ../rootimg.gz";
}
$oldmask = umask 0077;
} elsif ($method =~ /txc/) {
my $isxz = system("bash -c 'type -p xz' >/dev/null 2>&1");
unless ($isxz == 0) {
$callback->({ error => ["Command xz does not exist, please make sure it works."] });
return 1;
} elsif ($method =~ /tar/) {
my $compress = "gzip";
#use "pigz" as the compress tool instead of gzip if "pigz" exist
my $ispigz = system("bash -c 'type -p pigz' >/dev/null 2>&1");
if ($ispigz == 0) {
$compress = "pigz";
} else {
my $isgzip = system("bash -c 'type -p gzip' >/dev/null 2>&1");
unless ($isgzip == 0) {
$callback->({ error => ["Command gzip does not exist, please make sure it works."] });
return 1;
}
}
$callback->({ info => ["It will take several minutes to complete. So please wait for several minutes, then the other operations could be done. Otherwise, the other operation will fail."] });
if (!$exlistloc) {
$excludestr = "find . -xdev | tar --selinux --xattrs-include='*' -T - -Jcvf ../rootimg.txz";
$excludestr = "find . -xdev -print0 | tar --selinux --xattrs-include='*' --null -T - -c | $compress -c - > ../rootimg.tgz";
} else {
chdir("$rootimg_dir");
system("$excludestr >> $xcat_packimg_tmpfile");
if ($includestr) {
system("$includestr >> $xcat_packimg_tmpfile");
}
$excludestr = "cat $xcat_packimg_tmpfile| tar --selinux --xattrs-include='*' -T - -Jcvf ../rootimg.txz";
$excludestr = "cat $xcat_packimg_tmpfile| tar --selinux --xattrs-include='*' -T - -c | $compress -c - > ../rootimg.tgz";
}
$oldmask = umask 0077;
} elsif ($method =~ /squashfs/) {
@ -470,7 +477,8 @@ sub process_request {
$callback->({ error => ["Invalid method '$method' requested"], errorcode => [1] });
}
chdir("$rootimg_dir");
`$excludestr`;
my $outputmsg = `$excludestr`;
$callback->({ info => ["$outputmsg"] });
if ($method =~ /cpio/) {
chmod 0644, "$destdir/rootimg.gz";
if ($dotorrent) {
@ -482,8 +490,8 @@ sub process_request {
chdir($currdir);
}
umask $oldmask;
} elsif ($method =~ /txc/) {
chmod 0644, "$destdir/rootimg.txz";
} elsif ($method =~ /tar/) {
chmod 0644, "$destdir/rootimg.tgz";
umask $oldmask;
} elsif ($method =~ /squashfs/) {
my $flags;

4
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -329,7 +329,7 @@ sub mknetboot
my $suffix = 'gz';
$suffix = 'sfs' if (-r "$rootimgdir/rootimg.sfs");
$suffix = 'txz' if (-r "$rootimgdir/rootimg.txz");
$suffix = 'tgz' if (-r "$rootimgdir/rootimg.tgz");
if ($statelite) {
unless (-r "$rootimgdir/kernel") {
@ -381,7 +381,7 @@ sub mknetboot
}
}
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.txz" or -r "$rootimgdir/rootimg.sfs") {
unless (-r "$rootimgdir/rootimg.gz" or -r "$rootimgdir/rootimg.tgz" or -r "$rootimgdir/rootimg.sfs") {
$callback->({
error => [qq{No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage before nodeset}],
errorcode => [1]

2
xCAT-server/share/xcat/netboot/rh/compute.pkglist
View File

@ -12,3 +12,5 @@ ntp
sysklogd
rpm
rsync
tar
gzip

2
xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist
View File

@ -13,3 +13,5 @@ rpm
rsync
rsyslog
e2fsprogs
gzip
tar

3
xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist
View File

@ -24,4 +24,5 @@ lsvpd
irqbalance
procps
parted
xz
gzip
tar

3
xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist
View File

@ -20,4 +20,5 @@ rsync
rsyslog
e2fsprogs
parted
xz
gzip
tar

3
xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
View File

@ -24,4 +24,5 @@ irqbalance
procps-ng
parted
net-tools
xz
gzip
tar

3
xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.pkglist
View File

@ -19,4 +19,5 @@ rsyslog
e2fsprogs
parted
net-tools
xz
gzip
tar

2
xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
View File

@ -1,6 +1,6 @@
#!/bin/sh
echo $drivers
dracut_install wget tar xz cpio gzip dash modprobe touch echo cut wc xz
dracut_install wget tar cpio gzip dash modprobe touch echo cut wc
dracut_install -o ctorrent
dracut_install grep ifconfig hostname awk egrep grep dirname expr
dracut_install mount.nfs

4
xCAT-server/share/xcat/netboot/rh/dracut/xcatroot
View File

@ -87,7 +87,7 @@ elif [ -r /rootimg.gz ]; then
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."
echo Done
elif [ -r /rootimg.txz ]; then
elif [ -r /rootimg.tgz ]; then
echo Setting up RAM-root tmpfs.
if [ -z $rootlimit ];then
mount -t tmpfs -o mode=755 rootfs $NEWROOT
@ -97,7 +97,7 @@ elif [ -r /rootimg.txz ]; then
cd $NEWROOT
echo -n "Extracting root filesystem:"
tar -Jxvf /rootimg.txz
tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz
$NEWROOT/etc/init.d/localdisk
echo Done
elif [ -r /rootimg-statelite.gz ]; then

2
xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
View File

@ -1,6 +1,6 @@
#!/bin/sh
echo $drivers
dracut_install wget cpio gzip modprobe touch echo cut wc xz
dracut_install wget tar cpio gzip modprobe touch echo cut wc
dracut_install grep ifconfig hostname awk egrep grep dirname expr
dracut_install mount.nfs
dracut_install parted mke2fs bc mkswap swapon chmod

6
xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
View File

@ -89,8 +89,8 @@ elif [ -r /rootimg.gz ]; then
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."
echo Done
elif [ -r /rootimg.txz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "rootimg.txz downloaded,setting up RAM-root tmpfs...."
elif [ -r /rootimg.tgz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "rootimg.tgz downloaded,setting up RAM-root tmpfs...."
echo Setting up RAM-root tmpfs.
if [ -z $rootlimit ];then
mount -t tmpfs -o mode=755 rootfs $NEWROOT
@ -101,7 +101,7 @@ elif [ -r /rootimg.txz ]; then
cd $NEWROOT
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Extracting root filesystem:"
echo -n "Extracting root filesystem:"
tar -Jxvf /rootimg.txz
tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."
echo Done

6
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -1612,7 +1612,7 @@ EOMS
print $inifile " zcat /rootimg.gz |cpio -idum\n";
print $inifile " fi\n";
print $inifile " echo Done\n";
print $inifile "elif [ -r /rootimg.txz ]; then\n";
print $inifile "elif [ -r /rootimg.tgz ]; then\n";
print $inifile " echo Setting up RAM-root tmpfs.\n";
if ($rootlimit) {
@ -1622,7 +1622,7 @@ EOMS
}
print $inifile " cd \$NEWROOT\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " tar -Jxvf /rootimg.txz\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz\n";
print $inifile " echo Done\n";
print $inifile "else\n";
print $inifile " echo -n Failed to download image, panicing in 5...\n";
@ -1699,7 +1699,7 @@ EOMS
}
# add rsync for statelite
foreach ("bin/cpio", "sbin/nash", "sbin/busybox.anaconda", "sbin/rmmod", "bin/bash", "usr/sbin/chroot", "sbin/mount.nfs", "usr/bin/rsync", "usr/bin/wc", "usr/bin/xz") {
foreach ("bin/cpio", "sbin/nash", "sbin/busybox.anaconda", "sbin/rmmod", "bin/bash", "usr/sbin/chroot", "sbin/mount.nfs", "usr/bin/rsync", "usr/bin/wc", "usr/bin/gzip", "usr/bin/tar") {
getlibs($_);
push @filestoadd, $_;
}

2
xCAT-server/share/xcat/netboot/sles/compute.pkglist
View File

@ -11,3 +11,5 @@ wget
rsync
timezone
ntp
tar
gzip

2
xCAT-server/share/xcat/netboot/sles/compute.sles11.pkglist
View File

@ -17,3 +17,5 @@ rsync
timezone
bc
ntp
gzip
tar

2
xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.pkglist
View File

@ -19,3 +19,5 @@ lsvpd
irqbalance
procps
ntp
gzip
tar

1
xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.pkglist
View File

@ -41,4 +41,3 @@ udev
kernel-default
kernel-firmware
adaptec-firmware
xz

1
xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.pkglist
View File

@ -41,4 +41,3 @@ udev
kernel-default
kernel-firmware
adaptec-firmware
xz

2
xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
View File

@ -1,6 +1,6 @@
#!/bin/sh
echo $drivers
dracut_install wget cpio gzip modprobe touch echo cut wc xz
dracut_install wget tar cpio gzip modprobe touch echo cut wc
dracut_install grep ifconfig hostname awk egrep grep dirname expr
dracut_install mount.nfs
dracut_install parted mke2fs bc mkswap swapon chmod

6
xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot
View File

@ -87,8 +87,8 @@ elif [ -r /rootimg.gz ]; then
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."
echo Done
elif [ -r /rootimg.txz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "rootimg.txz downloaded,setting up RAM-root tmpfs...."
elif [ -r /rootimg.tgz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "rootimg.tgz downloaded,setting up RAM-root tmpfs...."
echo Setting up RAM-root tmpfs.
if [ -z $rootlimit ];then
mount -t tmpfs -o mode=755 rootfs $NEWROOT
@ -99,7 +99,7 @@ elif [ -r /rootimg.txz ]; then
cd $NEWROOT
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Extracting root filesystem:"
echo -n "Extracting root filesystem:"
tar -Jxvf /rootimg.txz
tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."
echo Done

9
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -1639,7 +1639,7 @@ EOMS
print $inifile " zcat /rootimg.gz |cpio -idum\n";
print $inifile " fi\n";
print $inifile " echo Done\n";
print $inifile "elif [ -r /rootimg.txz ]; then\n";
print $inifile "elif [ -r /rootimg.tgz ]; then\n";
print $inifile " echo Setting up RAM-root tmpfs.\n";
if ($rootlimit) {
@ -1649,7 +1649,7 @@ EOMS
}
print $inifile " cd \$NEWROOT\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " tar -Jxvf /rootimg.txz\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz\n";
print $inifile " echo Done\n";
print $inifile "else\n";
print $inifile " echo -n Failed to download image, panicing in 5...\n";
@ -1758,7 +1758,7 @@ EOMS
}
}
if ($mode eq "statelite") {
foreach ("sbin/ifconfig", "usr/bin/clear", "usr/bin/touch", "bin/hostname", "usr/bin/egrep", "bin/ln", "bin/ls", "usr/bin/dirname", "usr/bin/expr", "usr/bin/chroot", "usr/bin/grep", "bin/cpio", "bin/sleep", "bin/mount", "bin/umount", "sbin/dhcpcd", "bin/bash", "sbin/insmod", "bin/mkdir", "bin/mknod", "sbin/ip", "bin/cat", "usr/bin/awk", "usr/bin/wget", "bin/cp", "usr/bin/cpio", "usr/bin/zcat", "usr/bin/gzip", "lib/mkinitrd/bin/run-init", "usr/bin/uniq", "usr/bin/sed", "usr/bin/wc", "bin/sed", "sbin/udevd", "usr/bin/readlink", "usr/sbin/parted", "sbin/mke2fs", "sbin/mkswap", "sbin/swapon", "bin/chmod", "usr/bin/bc", "usr/bin/xz") {
foreach ("sbin/ifconfig", "usr/bin/clear", "usr/bin/touch", "bin/hostname", "usr/bin/egrep", "bin/ln", "bin/ls", "usr/bin/dirname", "usr/bin/expr", "usr/bin/chroot", "usr/bin/grep", "bin/cpio", "bin/sleep", "bin/mount", "bin/umount", "sbin/dhcpcd", "bin/bash", "sbin/insmod", "bin/mkdir", "bin/mknod", "sbin/ip", "bin/cat", "usr/bin/awk", "usr/bin/wget", "bin/cp", "usr/bin/cpio", "usr/bin/zcat", "usr/bin/gzip", "lib/mkinitrd/bin/run-init", "usr/bin/uniq", "usr/bin/sed", "usr/bin/wc", "bin/sed", "sbin/udevd", "usr/bin/readlink", "usr/sbin/parted", "sbin/mke2fs", "sbin/mkswap", "sbin/swapon", "bin/chmod", "usr/bin/bc", "usr/bin/gzip", "usr/bin/tar") {
getlibs($_);
push @filestoadd, $_;
}
@ -1770,7 +1770,7 @@ EOMS
}
} else {
foreach ("sbin/ifconfig", "usr/bin/clear", "usr/bin/touch", "usr/bin/grep", "usr/bin/egrep", "bin/cpio", "bin/sleep", "bin/mount", "sbin/dhcpcd", "bin/bash", "sbin/insmod", "bin/mkdir", "bin/mknod", "sbin/ip", "bin/cat", "usr/bin/awk", "usr/bin/wget", "bin/cp", "usr/bin/cpio", "usr/bin/zcat", "usr/bin/gzip", "lib/mkinitrd/bin/run-init", "usr/bin/uniq", "usr/bin/sed", "sbin/udevd", "usr/bin/readlink", "usr/bin/expr", "usr/sbin/parted", "sbin/mke2fs", "sbin/mkswap", "sbin/swapon", "bin/chmod", "usr/bin/bc", "usr/bin/xz") {
foreach ("sbin/ifconfig", "usr/bin/clear", "usr/bin/touch", "usr/bin/grep", "usr/bin/egrep", "bin/cpio", "bin/sleep", "bin/mount", "sbin/dhcpcd", "bin/bash", "sbin/insmod", "bin/mkdir", "bin/mknod", "sbin/ip", "bin/cat", "usr/bin/awk", "usr/bin/wget", "bin/cp", "usr/bin/cpio", "usr/bin/zcat", "usr/bin/gzip", "lib/mkinitrd/bin/run-init", "usr/bin/uniq", "usr/bin/sed", "sbin/udevd", "usr/bin/readlink", "usr/bin/expr", "usr/sbin/parted", "sbin/mke2fs", "sbin/mkswap", "sbin/swapon", "bin/chmod", "usr/bin/bc", "usr/bin/gzip", "usr/bin/tar") {
getlibs($_);
push @filestoadd, $_;
}
@ -2422,3 +2422,4 @@ sub usage {
print " genimage -i eth0 -n tg3,bnx2 -o sles11 -p compute --permission 777\n";
return 0;
}

2
xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
View File

@ -12,3 +12,5 @@ rsyslog
rsync
busybox-static
gawk
tar
gzip

3
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.4.ppc64el.pkglist
View File

@ -13,4 +13,5 @@ rsync
busybox-static
gawk
dnsutils
xz-utils
tar
gzip

3
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.4.x86_64.pkglist
View File

@ -13,4 +13,5 @@ rsync
busybox-static
gawk
dnsutils
xz-utils
tar
gzip

2
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.pkglist
View File

@ -12,3 +12,5 @@ rsyslog
rsync
busybox-static
gawk
tar
gzip

2
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.pkglist
View File

@ -12,3 +12,5 @@ rsyslog
rsync
busybox-static
gawk
tar
gzip

3
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.ppc64el.pkglist
View File

@ -14,4 +14,5 @@ rsync
busybox-static
gawk
dnsutils
xz-utils
tar
gzip

3
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.x86_64.pkglist
View File

@ -14,4 +14,5 @@ rsync
busybox-static
gawk
dnsutils
xz-utils
tar
gzip

2
xCAT-server/share/xcat/netboot/ubuntu/dracut/install.netboot
View File

@ -1,6 +1,6 @@
#!/bin/sh
echo $drivers
dracut_install wget cpio gzip dash modprobe touch echo cut wc xz
dracut_install wget tar cpio gzip dash modprobe touch echo cut wc
dracut_install grep ifconfig hostname awk egrep grep dirname expr
dracut_install mount.nfs
inst "$moddir/xcatroot" "/sbin/xcatroot"

4
xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot
View File

@ -50,12 +50,12 @@ elif [ -r /rootimg.gz ]; then
gzip -cd /rootimg.gz |cpio -idum
fi
echo Done
elif [ -r /rootimg.txz ]; then
elif [ -r /rootimg.tgz ]; then
echo Setting up RAM-root tmpfs.
mount -t tmpfs -o mode=755 rootfs $NEWROOT
cd $NEWROOT
echo -n "Extracting root filesystem:"
tar -Jxvf /rootimg.txz
tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz
echo Done
elif [ -r /rootimg-statelite.gz ]; then
echo Setting up RAM-root tmpfs for statelite mode.

8
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@ -1459,8 +1459,8 @@ EOMS
print $inifile " fi\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"Done...\"\n";
print $inifile " echo Done\n";
print $inifile "elif [ -r /rootimg.txz ]; then\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"rootimg.txz downloaded,setting up RAM-root tmpfs...\"\n";
print $inifile "elif [ -r /rootimg.tgz ]; then\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"rootimg.tgz downloaded,setting up RAM-root tmpfs...\"\n";
print $inifile " echo Setting up RAM-root tmpfs.\n";
if ($rootlimit) {
@ -1471,7 +1471,7 @@ EOMS
print $inifile " cd \$NEWROOT\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"Extracting root filesystem:\"\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " tar -Jxvf /rootimg.txz\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tgz\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"Done...\"\n";
print $inifile " echo Done\n";
print $inifile "else\n";
@ -1612,7 +1612,7 @@ EOMS
}
# add rsync for statelite
foreach ("usr/bin/dig", "bin/busybox", "bin/bash", "sbin/mount.nfs", "usr/bin/rsync", "sbin/insmod", "sbin/udevd", "sbin/udevadm", "sbin/modprobe", "sbin/blkid", "sbin/depmod", "usr/bin/wget", "usr/bin/xz") {
foreach ("usr/bin/dig", "bin/busybox", "bin/bash", "sbin/mount.nfs", "usr/bin/rsync", "sbin/insmod", "sbin/udevd", "sbin/udevadm", "sbin/modprobe", "sbin/blkid", "sbin/depmod", "usr/bin/wget", "usr/bin/gzip", "usr/bin/tar") {
getlibs($_);
push @filestoadd, $_;
}