From: <bl...@sy...> - 2011-04-11 21:26:59
|
Author: bli Date: 2011-04-11 16:26:53 -0500 (Mon, 11 Apr 2011) New Revision: 4549 Modified: branches/4.2.x/CHANGE.LOG branches/4.2.x/lib/SystemImager/Common.pm branches/4.2.x/lib/SystemImager/Server.pm Log: Add support for devtmpfs (eg. on openSUSE 11.3) Reported-by: Thomas Zeiser <tho...@rr...> Modified: branches/4.2.x/CHANGE.LOG =================================================================== --- branches/4.2.x/CHANGE.LOG 2011-04-09 04:22:24 UTC (rev 4548) +++ branches/4.2.x/CHANGE.LOG 2011-04-11 21:26:53 UTC (rev 4549) @@ -52,7 +52,8 @@ - fix 'Use of uninitialized value' warning and disallow passing empty string to --update-script for si_getimage - allow parted version numbers a.b in addition to a.b.c -- add support of openSUSE 11.3 kernels in _get_kernel_release() for UYOK +- added support of openSUSE 11.3 kernels in _get_kernel_release() for UYOK +- added support for devtmpfs devstyle (openSUSE 11.3+) 4.1.6 -------------------------------------------------------------------------------- Modified: branches/4.2.x/lib/SystemImager/Common.pm =================================================================== --- branches/4.2.x/lib/SystemImager/Common.pm 2011-04-09 04:22:24 UTC (rev 4548) +++ branches/4.2.x/lib/SystemImager/Common.pm 2011-04-11 21:26:53 UTC (rev 4549) @@ -1669,6 +1669,8 @@ return 'udev'; } elsif (m/\bdevfs\b/) { return 'devfs'; + if ((m/\bdevtmpfs\b/) || (m/\/dev\sdevtmpfs\s/)) { + return 'devtmpfs'; } } close(FILE); Modified: branches/4.2.x/lib/SystemImager/Server.pm =================================================================== --- branches/4.2.x/lib/SystemImager/Server.pm 2011-04-09 04:22:24 UTC (rev 4548) +++ branches/4.2.x/lib/SystemImager/Server.pm 2011-04-11 21:26:53 UTC (rev 4549) @@ -1760,7 +1760,8 @@ $xml_config = XMLin($file, keyattr => { boel => "+devstyle"} ); if( defined($xml_config->{boel}->{devstyle}) && ( ("$xml_config->{boel}->{devstyle}" eq "udev" ) - or ("$xml_config->{boel}->{devstyle}" eq "devfs") ) + or ("$xml_config->{boel}->{devstyle}" eq "devfs") + or ("$xml_config->{boel}->{devstyle}" eq "devtmpfs") ) ) { $fs_by_mp{'/dev'} = "/dev"; } @@ -2316,6 +2317,7 @@ # Clients should have one of the following entries in their # autoinstallscript.conf file: # +# <boel devstyle="devtmpfs"/> # <boel devstyle="udev"/> # <boel devstyle="devfs"/> # <boel devstyle="static"/> @@ -2332,7 +2334,8 @@ if( defined($xml_config->{boel}->{devstyle}) && ( ("$xml_config->{boel}->{devstyle}" eq "devfs") - or ("$xml_config->{boel}->{devstyle}" eq "udev" ) ) + or ("$xml_config->{boel}->{devstyle}" eq "udev" ) + or ("$xml_config->{boel}->{devstyle}" eq "devtmpfs" ) ) ) { my $cmd = q(mount /dev /a/dev -o bind || shellout); |