diff options
| -rw-r--r-- | installer/OpenSLX/OSExport/Distro/Suse.pm | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 5 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/installer/OpenSLX/OSExport/Distro/Suse.pm b/installer/OpenSLX/OSExport/Distro/Suse.pm index 788cf080..cef63bd5 100644 --- a/installer/OpenSLX/OSExport/Distro/Suse.pm +++ b/installer/OpenSLX/OSExport/Distro/Suse.pm @@ -96,6 +96,7 @@ sub initDistroInfo - /opt/gnome/share/autostart/beagle*.desktop - /opt/gnome/share/gnome/autostart/beagle*.desktop - /usr/share/gnome/autostart/gpk-update-icon*.desktop + - */kupdateapplet.desktop - /mnt/* - /media/* + /media diff --git a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm index 937fc468..8b214590 100644 --- a/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm +++ b/os-plugins/plugins/syslog/OpenSLX/OSPlugin/syslog.pm @@ -68,7 +68,7 @@ sub getAttrInfo description => unshiftHereDoc(<<' End-of-Here'), kind of syslog to use \(syslogd-ng or old-style syslog\) End-of-Here - content_regex => undef, + content_regex => qr{^(syslog-ng|syslog)$}, content_descr => 'allowed: syslogd-ng, syslog', default => 'syslog-ng', }, diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index f3e059b7..2ace7706 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -135,8 +135,9 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ mknod /dev/vmnet8 c 119 8 fi # copy the runlevel script to the proper place and activate it - cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \ - /mnt/etc/init.d/vmware-env \ + sed "s/eth0/$nwif/g" \ + /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \ + > /mnt/etc/init.d/vmware-env \ || echo " * Error copying runlevel script. Shouldn't happen." chmod a+x /mnt/etc/init.d/vmware-env rllinker "vmware-env" 20 2 diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 7ae843ea..05beca36 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -100,6 +100,8 @@ ethernet0.present = \"TRUE\" ethernet0.addressType = \"static\" #ethernet0.virtualDev = \"e1000\" ethernet0.connectionType = \"${network_kind}\" +#ethernet1.connectionType = \"custom\" +#ethernet1.vnet = \"/dev/vmnet2\" ethernet0.address = \"00:50:56:0D:${mac}\" ethernet0.wakeOnPcktRcv = \"FALSE\" |