Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
Luca Favatella <slackydeb@gmail.com> writes:
> On 15/03/2009, Otavio Salvador <otavio@debian.org> wrote:
>> Luk Claes <luk@debian.org> writes:
>>
>>> Otavio Salvador wrote:
> [...]
>>>> While I understand why those options are required I dislike the idea to
>>>> have them at official deboostrap.
>>>
>>> They are more generally useful though. Everyone who wants to test with
>>> adding extra packages (that are not in Debian proper) to base could use
>>> them.
>>
>> To make easy for us to decide about it all, it would be nice if Luca
>> could split the patch in two. One adding the
>> --extra-{mirror,suite,include} options and another with freebsd
>> specifics. Could you (Luca) take a look and split it for us?
>
> Here they are.
>
>
> libc_svn.diff
> I think this could go into debootstrap svn without further testing.
Commited. It was wrong and Colin has catch it just after my
commit. Fixed in SVN.
> extra_svn.diff
> Add the --extra-{mirror,suite,include} options; needs review and testing.
See comments.
[...]
[...]
> Index: debootstrap
> ===================================================================
> --- debootstrap (revision 57816)
> +++ debootstrap (working copy)
> @@ -9,6 +9,9 @@
> if [ "$DEBOOTSTRAP_DIR" = "" ]; then
> if [ -x /debootstrap/debootstrap ]; then
> DEBOOTSTRAP_DIR=/debootstrap
> + elif [ -x $(pwd)/debootstrap ]; then
> + echo "Warning: Make sure that 'fakeroot make devices.tar.gz' was done"
> + DEBOOTSTRAP_DIR=$(pwd)
> else
> DEBOOTSTRAP_DIR=/usr/share/debootstrap
> fi
This should be splited. This is indeed useful and would be nice to warn
also that it is using the local copy. But this is unrelated to rest of
the patch.
> @@ -93,6 +96,8 @@
> (requires --second-stage)
> --boot-floppies used for internal purposes by boot-floppies
> --debian-installer used for internal purposes by debian-installer
> +
> + --extra-* used by porters, see the manpage
> EOF
> }
>
> @@ -283,6 +288,26 @@
> error 1 NEEDARG "option requires an argument %s" "$1"
> fi
> ;;
> + --extra-mirror)
> + if [ -n "$2" ] ; then
> + EXTRA_MIRROR="$2"
> + shift 2
> + else
> + error 1 NEEDARG "option requires an argument %s" "$1"
> + fi
> + ;;
> + --extra-suite)
> + if [ -n "$2" ] ; then
> + EXTRA_SUITE="$2"
> + shift 2
> + else
> + error 1 NEEDARG "option requires an argument %s" "$1"
> + fi
> + ;;
> + --extra-include*)
> + extra_debs="$(echo $1 | cut -f2 -d"="|tr , " ")"
> + shift 1
> + ;;
> --*)
> error 1 BADARG "unrecognized or invalid option %s" "$1"
> ;;
> @@ -349,8 +374,12 @@
> error 1 WHATARCH "Couldn't work out current architecture"
> fi
>
> -export ARCH SUITE TARGET
> +if [ "$extra_debs" != "" -a "$EXTRA_SUITE" = "" ]; then
> + EXTRA_SUITE="unreleased"
> +fi
I dislike to have it as default. It is better to raise a error and force
user to provide it.
[...]
--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: otavio@debian.org UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
you the whole house."
Reply to: