Merge branch '2.4.2/18448-do-not-use-localtime'

This commit is contained in:
Daniel Dehennin 2016-12-23 13:35:19 +01:00
commit edc07ce939

View File

@ -130,7 +130,7 @@ INPUT=[BUS="usb",TYPE="tablet"]
CPU="0.2"
DISK=[DEV_PREFIX="vd",IMAGE_UNAME="oneadmin",IMAGE="${DISKNAME}",DRIVER="qcow2"]
DISK=[DEV_PREFIX="hd",IMAGE_UNAME="oneadmin",IMAGE="${ISONAME}",DRIVER="raw"]
FEATURES=[ACPI="yes",PAE="no",LOCALTIME="yes"]
FEATURES=[ACPI="yes",PAE="no"]
VCPU="1"
GRAPHICS=[LISTEN="0.0.0.0",TYPE="vnc",KEYMAP="fr"]
OS = [ ARCH = "x86_64", BOOT = "disk0,disk1" ]