> @@ -1882,6 +1887,12 @@ int main(int argc, char ** argv) {
> flags |= LOADER_FLAGS_NOSHELL;
> #endif
>
> + /* XXX if RHEL, enable the AUTODD feature by default,
> + * but we should come with more general way how to control this */
> + if (!strncmp(getProductName(), "Red Hat", 7)) {
> + flags |= LOADER_FLAGS_AUTOMODDISK;
> + }
> +
> openLog(FL_TESTING(flags));
> if (!FL_TESTING(flags))
> openlog("loader", 0, LOG_LOCAL0);
I can't think of a better way to do this in the loader, unfortunately.
We're making things harder on redistributers like Centos. There, it's
going to be disabled by default whereas on RHEL, it'll be enabled by
default. So, derived distributions will function differently than the
original.
Still, I can't think of a better way.
> diff --git a/loader/loader.h b/loader/loader.h
> index ebf3766..ca6404f 100644
> --- a/loader/loader.h
> +++ b/loader/loader.h
> @@ -70,6 +70,7 @@
> #define LOADER_FLAGS_HAVE_CMSCONF (((uint64_t) 1) << 37)
> #define LOADER_FLAGS_NOKILL (((uint64_t) 1) << 38)
> #define LOADER_FLAGS_KICKSTART_SEND_SERIAL (((uint64_t) 1) << 39)
> +#define LOADER_FLAGS_AUTOMODDISK (((uint64_t) 1) << 40)
>
> #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING)
> #define FL_TEXT(a) ((a) & LOADER_FLAGS_TEXT)
You could get away with recycling one of the earlier unused numbers if
you wanted. This patch looks fine though.
- Chris
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
