"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "packages/web/lib/fog/bootmenu.class.php" between
fogproject-1.5.7.tar.gz and fogproject-1.5.8.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

bootmenu.class.php  (fogproject-1.5.7):bootmenu.class.php  (fogproject-1.5.8)
skipping to change at line 146 skipping to change at line 146
if (stripos($_REQUEST['arch'], 'i386') !== false) { if (stripos($_REQUEST['arch'], 'i386') !== false) {
//user i386 boot loaders instead //user i386 boot loaders instead
$refind = sprintf( $refind = sprintf(
'imgfetch ${boot-url}/service/ipxe/refind.conf%s' 'imgfetch ${boot-url}/service/ipxe/refind.conf%s'
. 'chain -ar ${boot-url}/service/ipxe/refind_ia32.efi', . 'chain -ar ${boot-url}/service/ipxe/refind_ia32.efi',
"\n" "\n"
); );
} }
if (stripos($_REQUEST['arch'], 'arm') !== false) {
//use arm boot loaders instead
$refind = 'chain -ar ${boot-url}/service/ipxe/refind_aa64.efi';
}
$grub = array( $grub = array(
'basic' => sprintf( 'basic' => sprintf(
$grubChain, $grubChain,
'rootnoverify (hd0);chainloader +1' 'rootnoverify (hd0);chainloader +1'
), ),
'1cd' => sprintf( '1cd' => sprintf(
$grubChain, $grubChain,
'cdrom --init;map --hook;root (cd0);chainloader (cd0)"' 'cdrom --init;map --hook;root (cd0);chainloader (cd0)"'
), ),
'1fw' => sprintf( '1fw' => sprintf(
skipping to change at line 388 skipping to change at line 393
$this->_storage = sprintf( $this->_storage = sprintf(
'storage=%s:/%s/ storageip=%s', 'storage=%s:/%s/ storageip=%s',
trim($StorageNode->get('ip')), trim($StorageNode->get('ip')),
trim($StorageNode->get('path'), '/'), trim($StorageNode->get('path'), '/'),
trim($StorageNode->get('ip')) trim($StorageNode->get('ip'))
); );
} }
$this->_kernel = sprintf( $this->_kernel = sprintf(
'kernel %s %s initrd=%s root=/dev/ram0 rw ' 'kernel %s %s initrd=%s root=/dev/ram0 rw '
. 'ramdisk_size=%s%sweb=%s consoleblank=0%s rootfstype=ext4%s%s ' . 'ramdisk_size=%s%sweb=%s consoleblank=0%s rootfstype=ext4%s%s '
. '%s', . '%s nvme_core.default_ps_max_latency_us=0',
$bzImage, $bzImage,
$this->_loglevel, $this->_loglevel,
basename($initrd), basename($initrd),
$ramsize, $ramsize,
strlen($keymap) ? sprintf(' keymap=%s ', $keymap) : ' ', strlen($keymap) ? sprintf(' keymap=%s ', $keymap) : ' ',
$this->_web, $this->_web,
$kernelDebug ? ' debug' : ' ', $kernelDebug ? ' debug' : ' ',
$kernelArgs ? sprintf(' %s', $kernelArgs) : '', $kernelArgs ? sprintf(' %s', $kernelArgs) : '',
( (
self::$Host->isValid() && self::$Host->get('kernelArgs') ? self::$Host->isValid() && self::$Host->get('kernelArgs') ?
skipping to change at line 1393 skipping to change at line 1398
} }
if ($TaskType->isInitNeededTasking()) { if ($TaskType->isInitNeededTasking()) {
$Image = $Task->getImage(); $Image = $Task->getImage();
$StorageGroup = null; $StorageGroup = null;
$StorageNode = null; $StorageNode = null;
self::$HookManager->processEvent( self::$HookManager->processEvent(
'BOOT_TASK_NEW_SETTINGS', 'BOOT_TASK_NEW_SETTINGS',
array( array(
'Host' => &self::$Host, 'Host' => &self::$Host,
'StorageNode' => &$StorageNode, 'StorageNode' => &$StorageNode,
'StorageGroup' => &$StorageGroup 'StorageGroup' => &$StorageGroup,
'TaskType' => &$TaskType
) )
); );
if (!$StorageGroup || !$StorageGroup->isValid()) { if (!$StorageGroup || !$StorageGroup->isValid()) {
$StorageGroup = $Image->getStorageGroup(); $StorageGroup = $Image->getStorageGroup();
} }
$getter = 'getOptimalStorageNode'; $getter = 'getOptimalStorageNode';
if ($Task->isCapture() if ($Task->isCapture()
|| $TaskType->isCapture() || $TaskType->isCapture()
) { ) {
$StorageGroup = $Image->getPrimaryStorageGroup(); $StorageGroup = $Image->getPrimaryStorageGroup();
skipping to change at line 1424 skipping to change at line 1430
} }
if ($Task->get('storagegroupID') != $StorageGroup->get('id')) { if ($Task->get('storagegroupID') != $StorageGroup->get('id')) {
$Task->set('storagegroupID', $StorageGroup->get('id')); $Task->set('storagegroupID', $StorageGroup->get('id'));
} }
$Task->save(); $Task->save();
self::$HookManager->processEvent( self::$HookManager->processEvent(
'BOOT_TASK_NEW_SETTINGS', 'BOOT_TASK_NEW_SETTINGS',
array( array(
'Host' => &self::$Host, 'Host' => &self::$Host,
'StorageNode' => &$StorageNode, 'StorageNode' => &$StorageNode,
'StorageGroup' => &$StorageGroup 'StorageGroup' => &$StorageGroup,
'TaskType' => &$TaskType
) )
); );
$osid = (int)$Image->get('osID'); $osid = (int)$Image->get('osID');
$storage = ''; $storage = '';
$img = ''; $img = '';
$imgFormat = ''; $imgFormat = '';
$imgType = ''; $imgType = '';
$imgPartitionType = ''; $imgPartitionType = '';
$serviceNames = array( $serviceNames = array(
'FOG_CAPTUREIGNOREPAGEHIBER', 'FOG_CAPTUREIGNOREPAGEHIBER',
 End of changes. 4 change blocks. 
3 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)