diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2011-02-10 10:28:15 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2011-02-10 10:28:15 +0000 |
| commit | 957e38f9e34a1656323ad947a02e22e4691f6e7d (patch) | |
| tree | 3a726e2a3d93c6680db734b1990184e5eade818c | |
| parent | e511ee416fe9d9dced9c7424cb16a5b66d7bfe41 (diff) | |
| download | bcd-957e38f9e34a1656323ad947a02e22e4691f6e7d.tar bcd-957e38f9e34a1656323ad947a02e22e4691f6e7d.tar.gz bcd-957e38f9e34a1656323ad947a02e22e4691f6e7d.tar.bz2 bcd-957e38f9e34a1656323ad947a02e22e4691f6e7d.tar.xz bcd-957e38f9e34a1656323ad947a02e22e4691f6e7d.zip | |
add chroot_media and chroot_media_exclude parameter
| -rw-r--r-- | BCD/Common.pm | 3 | ||||
| -rw-r--r-- | BCD/Media.pm | 2 | ||||
| -rw-r--r-- | dual.xml | 2 | ||||
| -rw-r--r-- | dual64.xml | 2 | ||||
| -rw-r--r-- | dvd_free32.xml | 2 | ||||
| -rw-r--r-- | dvd_free64.xml | 2 | ||||
| -rw-r--r-- | dvd_pwp32.xml | 4 | ||||
| -rw-r--r-- | dvd_pwp64.xml | 2 |
8 files changed, 17 insertions, 2 deletions
diff --git a/BCD/Common.pm b/BCD/Common.pm index c5a71ae..126c207 100644 --- a/BCD/Common.pm +++ b/BCD/Common.pm @@ -56,6 +56,9 @@ $NB_FORK or print_color("You must define the <nb_fork> tag",$color) and exit 1; $version or print_color("You must define the <mediainfo><version>", $color) and exit 1; $repo or print_color("You must define the <repo><path> tag",$color) and exit 1; $based_on or print_color("You must define the <based_on> tag",$color) and exit 1; +$isoconf->{chroot_media} or print_color("Now you must define <chroot_media> in the conf.xml file",$color) and exit 1; +$isoconf->{chroot_media_exclude} or print_color("Now you must define <chroot_media_exclude> in the conf.xml file",$color) and exit 1; + # password file #"/home/plop/.signature.gpg"; diff --git a/BCD/Media.pm b/BCD/Media.pm index aa50fad..86d38ec 100644 --- a/BCD/Media.pm +++ b/BCD/Media.pm @@ -251,7 +251,7 @@ sub mini_chroot { my $cmd = "LC_ALL=C sudo urpmi --quiet --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path"; # sudo urpmi --no-verify-rpm --auto --urpmi-root /tmp/mk --use-distrib /mnt/BIG/dis/2009.0/i586/ basesystem-minimal urpmi --test # - system("LC_ALL=C sudo urpmi --test --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root /tmp/$isoconf->{nameid}-$version-$isoconf->{arch} --media 'Main,Main Updates' --excludemedia 'Main Testing,Main Backports' urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot"); + system("LC_ALL=C sudo urpmi --test --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root /tmp/$isoconf->{nameid}-$version-$isoconf->{arch} --media '$isoconf->{chroot_media}' --excludemedia '$isoconf->{chroot_media_exclude}' urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot"); # install all those file to be able to use urpmi.XXXXXX system("LC_ALL=C $cmd --prefer $DISTRIB,$THEME urpmi bash"); system("sudo chroot $chroot_path mkdir -p $distrib_path"); @@ -14,6 +14,8 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!-- <fullpath></fullpath> --> @@ -14,6 +14,8 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!-- <fullpath></fullpath> --> diff --git a/dvd_free32.xml b/dvd_free32.xml index c142fb0..bbbe88f 100644 --- a/dvd_free32.xml +++ b/dvd_free32.xml @@ -14,6 +14,8 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!--<fullpath></fullpath>--> diff --git a/dvd_free64.xml b/dvd_free64.xml index 5376883..962eb95 100644 --- a/dvd_free64.xml +++ b/dvd_free64.xml @@ -14,6 +14,8 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <!-- <fullpath></fullpath> --> diff --git a/dvd_pwp32.xml b/dvd_pwp32.xml index 9ff676e..2e61af7 100644 --- a/dvd_pwp32.xml +++ b/dvd_pwp32.xml @@ -14,7 +14,9 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> - <isolinux desc="isolinux info"> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> + <isolonux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <firmware>yes</firmware> <!-- <fullpath></fullpath> --> diff --git a/dvd_pwp64.xml b/dvd_pwp64.xml index 3dc2fb9..9f99eb7 100644 --- a/dvd_pwp64.xml +++ b/dvd_pwp64.xml @@ -14,6 +14,8 @@ <path>/home/plop/build_bcd</path> </workdir> <tocopy_file>tocopy_plop</tocopy_file> + <chroot_media>Main,Main Updates</chroot_media> + <chroot_media_exclude>Main Backports,Main Testing</chroot_media_exclude> <isolinux desc="isolinux info"> <defaultpath>isolinux</defaultpath> <firmware>yes</firmware> |