On Thu, Feb 14, 2013 at 12:47 PM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote: > > On Sun, Feb 10, 2013 at 06:41:07PM +0200, Zeeshan Ali (Khattak) wrote: >> From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx> >> >> --- >> data/install-scripts/windows-sif.xml | 2 ++ >> data/install-scripts/windows-unattend.xml | 2 ++ >> data/schemas/libosinfo.rng | 16 ++++++++++++++++ >> osinfo/libosinfo.syms | 3 +++ >> osinfo/osinfo_install_script.c | 32 +++++++++++++++++++++++++++++++ >> osinfo/osinfo_install_script.h | 31 ++++++++++++++++++++++++++++++ >> osinfo/osinfo_loader.c | 2 ++ >> 7 files changed, 88 insertions(+) >> >> diff --git a/data/install-scripts/windows-sif.xml b/data/install-scripts/windows-sif.xml >> index 3bb79c8..9d56e0e 100644 >> --- a/data/install-scripts/windows-sif.xml >> +++ b/data/install-scripts/windows-sif.xml >> @@ -6,6 +6,7 @@ >> <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format> >> <expected-filename>winnt.sif</expected-filename> >> <can-pre-install-drivers>true</can-pre-install-drivers> >> + <pre-install-drivers-signing-req>none</pre-install-drivers-signing-req> >> <pre-install-driver-format>windows</pre-install-driver-format> >> <config> >> <param name="admin-password" policy="optional"/> >> @@ -77,6 +78,7 @@ >> <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format> >> <expected-filename>winnt.sif</expected-filename> >> <can-pre-install-drivers>true</can-pre-install-drivers> >> + <pre-install-drivers-signing-req>none</pre-install-drivers-signing-req> >> <pre-install-driver-format>windows</pre-install-driver-format> >> <config> >> <param name="admin-password" policy="optional"/> >> diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml >> index e306ec4..03ffb84 100644 >> --- a/data/install-scripts/windows-unattend.xml >> +++ b/data/install-scripts/windows-unattend.xml >> @@ -5,6 +5,7 @@ >> <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format> >> <expected-filename>autounattend.xml</expected-filename> >> <can-pre-install-drivers>true</can-pre-install-drivers> >> + <pre-install-drivers-signing-req>none</pre-install-drivers-signing-req> >> <pre-install-driver-format>windows</pre-install-driver-format> >> <config> >> <param name="admin-password" policy="optional"/> >> @@ -221,6 +222,7 @@ >> <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format> >> <expected-filename>autounattend.xml</expected-filename> >> <can-pre-install-drivers>true</can-pre-install-drivers> >> + <pre-install-drivers-signing-req>none</pre-install-drivers-signing-req> >> <pre-install-driver-format>windows</pre-install-driver-format> >> <config> >> <param name="admin-password" policy="optional"/> >> diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng >> index 96b31a7..4d64f8d 100644 >> --- a/data/schemas/libosinfo.rng >> +++ b/data/schemas/libosinfo.rng >> @@ -590,6 +590,11 @@ >> </element> >> </zeroOrMore> >> <optional> >> + <element name='pre-install-drivers-signing-req'> >> + <ref name='driver-signing-reqs'/> >> + </element> >> + </optional> >> + <optional> >> <element name='can-post-install-drivers'> >> <ref name='bool'/> >> </element> >> @@ -599,6 +604,11 @@ >> <ref name='driver-formats'/> >> </element> >> </zeroOrMore> >> + <optional> >> + <element name='post-install-drivers-signing-req'> >> + <ref name='driver-signing-reqs'/> >> + </element> >> + </optional> >> <element name='template'> >> <choice> >> <group> >> @@ -703,4 +713,10 @@ >> <param name="pattern">windows|script|package</param> >> </data> >> </define> >> + >> + <define name='driver-signing-reqs'> >> + <data type="string"> >> + <param name="pattern">strict|strict-mutable|warn|warn-mutable|none</param> > > Really not a big fan of these -mutable things, but they should not be > needed if there's a way to reenable driver signing after disabling it > during install. With your help, I was able to find ways to do temporary disabling of checks so these are not needed for XP anymore. However I'm not yet sure how we'd handle win7 case so they might be needed there. However, adding of new values in the enum/xml node is no problem so I'll drop these for now. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
