diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-18 22:44:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-18 22:44:05 +0200 |
| commit | 14a43495cabfe99a05d601353e34b5a5eb0317ed (patch) | |
| tree | 1af88913970b34b6756c8dc21430723782197d04 /scripts | |
| parent | 9a5a53f185ffede49e88cbdaf866adff6ffbb185 (diff) | |
| download | vyos-live-build-14a43495cabfe99a05d601353e34b5a5eb0317ed.tar.gz vyos-live-build-14a43495cabfe99a05d601353e34b5a5eb0317ed.zip | |
Correcting some distribution specific checks to make them derivatives compliant.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_binary_hdd | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 10 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_source_debian | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd index c1cd0427e..13f3f1823 100755 --- a/scripts/build/lb_binary_hdd +++ b/scripts/build/lb_binary_hdd @@ -50,7 +50,7 @@ case "${LB_BINARY_FILESYSTEM}" in ;; ntfs) - case "${LB_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION}" in squeeze) Check_package chroot/sbin/mkfs.ntfs ntfsprogs ;; diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index e4257cee9..99a7695b3 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -357,9 +357,13 @@ case "${LB_CHROOT_FILESYSTEM}" in esac fi - case "${LB_DISTRIBUTION}" in - wheezy|sid) - # FIXME: artax-backports once d-i has catched up + case "${LB_PARENT_DISTRIBUTION}" in + squeeze) + + ;; + + *) + # FIXME: artax-backports too, once d-i has catched up MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" ;; esac diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 0058f8e59..f2540f8b7 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -88,7 +88,7 @@ EOF case "${LB_MODE}" in debian|progress) case "${LB_PARENT_DISTRIBUTION}" in - sid|wheezy) + wheezy|sid) ;; @@ -657,7 +657,7 @@ EOF case "${LB_MODE}" in debian|progress) case "${LB_PARENT_DISTRIBUTION}" in - sid|wheezy) + wheezy|sid) ;; diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian index dcde7a477..910bef420 100755 --- a/scripts/build/lb_source_debian +++ b/scripts/build/lb_source_debian @@ -67,7 +67,7 @@ case "${LB_BINARY_FILESYSTEM}" in ;; ntfs) - case "${LB_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION}" in squeeze) echo "ntfsprogs" >> source-selection.txt ;; |