delta/syslinux.git/extlinux, branch syslinux-5.xx git.kernel.org: pub/scm/boot/syslinux/syslinux.git Merge remote-tracking branch 'origin/syslinux-4.xx' into syslinux-5.xx 2014-01-19T00:11:39+00:00 H. Peter Anvin hpa@zytor.com 2014-01-19T00:11:39+00:00 b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Resolved Conflicts:
	version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Makefiles: don't include *.tmp 2014-01-19T00:09:19+00:00 H. Peter Anvin hpa@zytor.com 2014-01-19T00:09:19+00:00 374a37434fa11bdc95e0bc243aadb7de36bbbf43 Since checkin: bd09a6d828fa Major Makefile cleanups; gcc 4.3.0 compatiblity ... we include *.tmp into the Makefiles as well as .*.d. This seems to have been a mistake in made when adding *.tmp to cleanup rules, probably using a sed script. This causes problems, because *.tmp files are generated by the gcc_ok macro and do not contain Makefile rules at all. Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Since checkin:

bd09a6d828fa Major Makefile cleanups; gcc 4.3.0 compatiblity

... we include *.tmp into the Makefiles as well as .*.d.  This seems
to have been a mistake in made when adding *.tmp to cleanup rules,
probably using a sed script.

This causes problems, because *.tmp files are generated by the gcc_ok
macro and do not contain Makefile rules at all.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
extlinux: Also install ldlinux.c32 file on XFS 2013-01-22T19:26:41+00:00 Paulo Alcantara pcacjr@zytor.com 2013-01-22T19:12:51+00:00 129a5845aec4d6c750c4bddd936f315fb441d2fa Signed-off-by: Paulo Alcantara <pcacjr@zytor.com> 
Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
extlinux: Fix installation subdirectory patching 2013-01-10T11:47:33+00:00 Matt Fleming matt.fleming@intel.com 2013-01-10T11:47:33+00:00 15d85f991bb2609aedce06c0e01d89b31c6dc008 Commit a126f17f663c ("EXTLINUX: Initial XFS filesystem support") broke the code that inserts the installation subdirectory into the Extended Patch Area (EPA). The EPA entry is used to set the initial working directory on boot. This caused boot failures for users that chose an install directory other than /boot/syslinux (technically, it failed for any path not in 'search_directories' in load_env32()) due to ldlinux.c32 failing to load because the initial working directory was not set correctly. Cc: Paulo Alcantara <pcacjr@zytor.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> 
Commit a126f17f663c ("EXTLINUX: Initial XFS filesystem support") broke
the code that inserts the installation subdirectory into the Extended
Patch Area (EPA). The EPA entry is used to set the initial working
directory on boot.

This caused boot failures for users that chose an install directory
other than /boot/syslinux (technically, it failed for any path not in
'search_directories' in load_env32()) due to ldlinux.c32 failing to
load because the initial working directory was not set correctly.

Cc: Paulo Alcantara <pcacjr@zytor.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
extlinux: Make sure ldlinux.sys file is installed 2013-01-10T10:51:16+00:00 Paulo Alcantara pcacjr@zytor.com 2013-01-07T08:14:47+00:00 39add3bc254a585aeba8dba7c32e4aa462221e24 Due to delayed allocation feature on XFS filesystems, a write is not guaranteed to flushed out to the underlying file system after crash or something else - so we need to make sure that ldlinux.sys is installed correctly in the mounted filesystem. Signed-off-by: Paulo Alcantara <pcacjr@zytor.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> 
Due to delayed allocation feature on XFS filesystems, a write is not
guaranteed to flushed out to the underlying file system after crash or
something else - so we need to make sure that ldlinux.sys is installed
correctly in the mounted filesystem.

Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Merge branch 'xfs-for-hpa' of git://zytor.com/users/pcacjr/syslinux into merge/elflink/xfs 2012-11-27T20:03:08+00:00 Matt Fleming matt.fleming@intel.com 2012-11-27T18:38:18+00:00 f3cac0e6203c532efc97a6ae8955fc4b79a2b373 Pull XFS filesystem driver from Paulo Alcantara, * 'xfs-for-hpa' of git://zytor.com/users/pcacjr/syslinux: (60 commits) xfs: Fix the way we check di_mode of an inode xfs: Cleanup previous commit xfs: Add xfs_readlink() xfs: Cleanup and remove some trailing whitespaces xfs: Add XFS_DINODE_FMT_BTREE support in xfs_next_extent() xfs: Cleanup and remove some trailing whitespaces xfs: Rework xfs_dir2_get_right_blk() xfs: cleanup unused structure xfs: Remove some trailing whitespaces xfs: Add full B+tree search support in xfs_dir2_node_find_entry() xfs: Add xfs_fmt_btree_find_entry() xfs: Fix memory leak in xfs_dir2_node_find_entry() function xfs: Cleanup xfs_readdir_dir2_leaf() function xfs: Implement xfs_readdir_dir2_node() function EXTLINUX: Add sanity check for XFS filesystems xfs: Add xfs_fmt_local_readdir() function xfs: Add xfs_fmt_local_find_entry() function xfs: Move readdir functions to another source file xfs: Remove trailing whitespace in xfs_dir2_isleaf() function xfs: Move dir2 functions to another source file ... Conflicts: extlinux/main.c 
Pull XFS filesystem driver from Paulo Alcantara,

* 'xfs-for-hpa' of git://zytor.com/users/pcacjr/syslinux: (60 commits)
  xfs: Fix the way we check di_mode of an inode
  xfs: Cleanup previous commit
  xfs: Add xfs_readlink()
  xfs: Cleanup and remove some trailing whitespaces
  xfs: Add XFS_DINODE_FMT_BTREE support in xfs_next_extent()
  xfs: Cleanup and remove some trailing whitespaces
  xfs: Rework xfs_dir2_get_right_blk()
  xfs: cleanup unused structure
  xfs: Remove some trailing whitespaces
  xfs: Add full B+tree search support in xfs_dir2_node_find_entry()
  xfs: Add xfs_fmt_btree_find_entry()
  xfs: Fix memory leak in xfs_dir2_node_find_entry() function
  xfs: Cleanup xfs_readdir_dir2_leaf() function
  xfs: Implement xfs_readdir_dir2_node() function
  EXTLINUX: Add sanity check for XFS filesystems
  xfs: Add xfs_fmt_local_readdir() function
  xfs: Add xfs_fmt_local_find_entry() function
  xfs: Move readdir functions to another source file
  xfs: Remove trailing whitespace in xfs_dir2_isleaf() function
  xfs: Move dir2 functions to another source file
  ...

Conflicts:
	extlinux/main.c
extlinux: Avoid dereferencing a garbage pointer 2012-11-05T08:59:24+00:00 Matt Fleming matt.fleming@intel.com 2012-11-02T17:02:36+00:00 2a7fdfe43f7b9fc6360fe67b023f17ebb23a996c If opt.reset_adv is set the call to ext_read_adv() is skipped which would have initialised 'filename'. This means that a pointer containing random data from the stack is passed to ext_write_adv(). Just delete the opt.reset_adv logic since modify_adv() handles that case anyway. Reported-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> 
If opt.reset_adv is set the call to ext_read_adv() is skipped which
would have initialised 'filename'. This means that a pointer
containing random data from the stack is passed to ext_write_adv().

Just delete the opt.reset_adv logic since modify_adv() handles that
case anyway.

Reported-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
extlinux: Avoid dereferencing a garbage pointer 2012-11-05T08:29:58+00:00 Matt Fleming matt.fleming@intel.com 2012-11-02T17:02:36+00:00 2bc5ea50ca5f670c1101d7986a70adfc5cae8b48 If opt.reset_adv is set the call to ext_read_adv() is skipped which would have initialised 'filename'. This means that a pointer containing random data from the stack is passed to ext_write_adv(). Just delete the opt.reset_adv logic since modify_adv() handles that case anyway. Reported-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> 
If opt.reset_adv is set the call to ext_read_adv() is skipped which
would have initialised 'filename'. This means that a pointer
containing random data from the stack is passed to ext_write_adv().

Just delete the opt.reset_adv logic since modify_adv() handles that
case anyway.

Reported-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Merge branch 'master' into elflink 2012-10-24T13:41:00+00:00 Matt Fleming matt.fleming@intel.com 2012-10-24T13:41:00+00:00 a7115d314dda45324baccee6898a561ed253c8e1 The following conflict is a result of the fact comapi_chainboot was only stubbed out on the 'elflink' branch but was properly marked as obsolete in 'master'. Conflicts: core/comboot.inc 
The following conflict is a result of the fact comapi_chainboot was
only stubbed out on the 'elflink' branch but was properly marked as
obsolete in 'master'.

Conflicts:
	core/comboot.inc
make some functions static remove unused NADV define 2012-10-09T13:13:07+00:00 Frediano Ziglio frediano.ziglio@citrix.com 2012-08-02T08:30:04+00:00 3862b19dcc6de2a2653bb9fbe4c6ad4f062d9714 Just some minor cleanup Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> 
Just some minor cleanup

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>