Attachment #71494 for bug #69590

View | Details | Raw Unified | Return to bug 69590
Collapse All | Expand All

Lines 207-212 Link Here

(-)grub-0.96.orig/INSTALL (+3 lines)
207	`--disable-reiserfs'	207	`--disable-reiserfs'
208	Omit the ReiserFS support in Stage 2.	208	Omit the ReiserFS support in Stage 2.
209		209
		210	`--disable-reiser4'
		211	Omit the Reiser4 support in Stage 2.
		212
210	`--disable-vstafs'	213	`--disable-vstafs'
211	Omit the VSTa filesystem support in Stage 2.	214	Omit the VSTa filesystem support in Stage 2.
212		215

Lines 27-35 Link Here

(-)grub-0.96.orig/config.h.in (+7 lines)
27	/* Define to 1 if you have the <inttypes.h> header file. */	27	/* Define to 1 if you have the <inttypes.h> header file. */
28	#undef HAVE_INTTYPES_H	28	#undef HAVE_INTTYPES_H
29		29
		30	/* Define to 1 if you have the `aal-minimal' library (-laal-minimal). */
		31	#undef HAVE_LIBAAL_MINIMAL
		32
30	/* Define if you have a curses library */	33	/* Define if you have a curses library */
31	#undef HAVE_LIBCURSES	34	#undef HAVE_LIBCURSES
32		35
		36	/* Define to 1 if you have the `reiser4-minimal' library (-lreiser4-minimal).
		37	*/
		38	#undef HAVE_LIBREISER4_MINIMAL
		39
33	/* Define to 1 if you have the <memory.h> header file. */	40	/* Define to 1 if you have the <memory.h> header file. */
34	#undef HAVE_MEMORY_H	41	#undef HAVE_MEMORY_H
35		42




  FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"
fi

dnl Checking for reiser4
REISER4_LIBS=""
REISER4_CFLAGS=""

OLD_LIBS=$LIBS
OLD_CFLAGS=$CFLAGS
LIBS=""
CFLAGS=""

AC_ARG_ENABLE(reiser4,
  [  --disable-reiser4       disable Reiser4 support in Stage 2])

if test x"$enable_reiser4" != xno; then
  AC_CHECK_LIB(aal-minimal, aal_mem_init, , 
    AC_MSG_WARN(
Reiser4 support is disabled due to inability find libaal-minimal with 
memory manager support turned on.)
    enable_reiser4=no
  )
fi
  
if test x"$enable_reiser4" != xno; then
  AC_CHECK_HEADER(aal/libaal.h, ,
  AC_MSG_WARN(
Libaal header files are not found. Reiser4 support is disabled
  )
  enable_reiser4=no)
fi
  
if test x"$enable_reiser4" != xno; then
  AC_CHECK_LIB(reiser4-minimal, reiser4_fs_open, , 
  AC_MSG_WARN(
Reiser4 support is disabled due to inability find valid libreiser4-minimal.)
    enable_reiser4=no, 
    -laal-minimal
  )
fi

if test x"$enable_reiser4" != xno; then
  AC_CHECK_HEADER(reiser4/libreiser4.h, ,
  AC_MSG_WARN(
Reiser4 header files are not found. Reiser4 support is disabled.
  )
  enable_reiser4=no)
fi

if test x"$enable_reiser4" != xno; then
  REISER4_CFLAGS="$REISER4_CFLAGS -DFSYS_REISER4=1"
  REISER4_LIBS=$LIBS
fi

if test x"$enable_reiser4" != xno; then
  AC_CHECK_LIB(reiser4-minimal, __sym40_plug_init, 
    REISER4_CFLAGS="$REISER4_CFLAGS -DENABLE_SYMLINKS=1",
AC_MSG_WARN(Reiser4 symlinks support is disabled.), 
    -laal-minimal
  )
fi

LIBS=$OLD_LIBS
CFLAGS=$OLD_CFLAGS

if test x"$enable_reiser4" != xno; then
  enable_reiser4_support=yes
  FSYS_CFLAGS="$FSYS_CFLAGS $REISER4_CFLAGS"
fi

AC_SUBST(REISER4_LIBS)
AC_SUBST(REISER4_CFLAGS)
AM_CONDITIONAL(ENABLE_REISER4_SUPPORT, test x"$enable_reiser4" != xno)

AC_ARG_ENABLE(vstafs,
  [  --disable-vstafs        disable VSTa FS support in Stage 2])


Lines 283-289 Link Here

(-)grub-0.96.orig/docs/grub.texi (-1 / +2 lines)
283	Support multiple filesystem types transparently, plus a useful explicit	283	Support multiple filesystem types transparently, plus a useful explicit
284	blocklist notation. The currently supported filesystem types are	284	blocklist notation. The currently supported filesystem types are
285	@dfn{BSD FFS}, @dfn{DOS FAT16 and FAT32}, @dfn{Minix fs}, @dfn{Linux	285	@dfn{BSD FFS}, @dfn{DOS FAT16 and FAT32}, @dfn{Minix fs}, @dfn{Linux
286	ext2fs}, @dfn{ReiserFS}, @dfn{JFS}, @dfn{XFS}, and @dfn{VSTa	286	ext2fs}, @dfn{ReiserFS}, @dfn{ReiserFS}, @dfn{JFS}, @dfn{XFS}, and @dfn{VSTa
287	fs}. @xref{Filesystem}, for more information.	287	fs}. @xref{Filesystem}, for more information.
288		288
289	@item Support automatic decompression	289	@item Support automatic decompression
Lines 1776-1781 Link Here
1776	@itemx jfs_stage1_5	1776	@itemx jfs_stage1_5
1777	@itemx minix_stage1_5	1777	@itemx minix_stage1_5
1778	@itemx reiserfs_stage1_5	1778	@itemx reiserfs_stage1_5
		1779	@itemx reiser4_stage1_5
1779	@itemx vstafs_stage1_5	1780	@itemx vstafs_stage1_5
1780	@itemx xfs_stage1_5	1781	@itemx xfs_stage1_5
1781		1782

Lines 16-19 Link Here

(-)grub-0.96.orig/grub/Makefile.am (-1 / +1 lines)
16	AM_CFLAGS = $(GRUB_CFLAGS)	16	AM_CFLAGS = $(GRUB_CFLAGS)
17		17
18	grub_SOURCES = main.c asmstub.c	18	grub_SOURCES = main.c asmstub.c
19	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)	19	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS) $(REISER4_LIBS)




sbin_PROGRAMS = grub

if SERIAL_SPEED_SIMULATION
SERIAL_FLAGS = -DSUPPORT_SERIAL=1 -DSIMULATE_SLOWNESS_OF_SERIAL=1
else
SERIAL_FLAGS = -DSUPPORT_SERIAL=1 
endif

AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_HERCULES=1 \
	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib

AM_CFLAGS = $(GRUB_CFLAGS)

grub_SOURCES = main.c asmstub.c
grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)




# For <stage1.h>.
INCLUDES = -I$(top_srcdir)/stage1

if ENABLE_REISER4_SUPPORT
REISER4_STAGE1_5 = reiser4_stage1_5
REISER4_STAGE1_5_EXEC = reiser4_stage1_5.exec
else
REISER4_STAGE1_5 =
REISER4_STAGE1_5_EXEC =
endif

# The library for /sbin/grub.
noinst_LIBRARIES = libgrub.a
libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_reiser4.c fsys_ufs2.c \
	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
	terminfo.c tparm.c graphics.c
libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
	$(REISER4_CFLAGS) -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1

# Stage 2 and Stage 1.5's.

if DISKLESS_SUPPORT
pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
	reiserfs_stage1_5 $(REISER4_STAGE1_5) ufs2_stage1_5 \
	vstafs_stage1_5 xfs_stage1_5 nbgrub pxegrub
noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
	reiserfs_stage1_5.exec $(REISER4_STAGE1_5_EXEC) ufs2_stage1_5.exec \
	vstafs_stage1_5.exec xfs_stage1_5.exec nbloader.exec pxeloader.exec \
	diskless.exec
else
pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
	reiserfs_stage1_5 $(REISER4_STAGE1_5) ufs2_stage1_5 \
	vstafs_stage1_5 xfs_stage1_5
noinst_DATA = pre_stage2 start start_eltorito
noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
	reiserfs_stage1_5.exec $(REISER4_STAGE1_5_EXEC) ufs2_stage1_5.exec \
	vstafs_stage1_5.exec xfs_stage1_5.exec
endif
MOSTLYCLEANFILES = $(noinst_PROGRAMS)


GRAPHICS_FLAGS =
endif

STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin \
	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)

STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000

pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
	fsys_reiserfs.c fsys_reiser4.c fsys_ufs2.c fsys_vstafs.c \
	fsys_xfs.c gunzip.c hercules.c md5.c serial.c smp-imps.c \
	stage2.c terminfo.c tparm.c graphics.c
pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)

if NETBOOT_SUPPORT
pre_stage2_exec_LDADD = ../netboot/libdrivers.a $(REISER4_LIBS)
else
pre_stage2_exec_LDADD = $(REISER4_LIBS)
endif

if DISKLESS_SUPPORT

	-DNO_BLOCK_FILES=1
reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For reiser4_stage1_5 target.
reiser4_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_reiser4.c bios.c
reiser4_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) $(REISER4_CFLAGS) \
	-DNO_BLOCK_FILES=1
reiser4_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) $(REISER4_CFLAGS) \
	-DNO_BLOCK_FILES=1
reiser4_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
reiser4_stage1_5_exec_LDADD = $(REISER4_LIBS)

# For vstafs_stage1_5 target.
vstafs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_vstafs.c bios.c




# For test target.
TESTS = size_test
noinst_SCRIPTS = $(TESTS)

# For dist target.
noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
        fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
	imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
	nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)

# For <stage1.h>.
INCLUDES = -I$(top_srcdir)/stage1

# The library for /sbin/grub.
noinst_LIBRARIES = libgrub.a
libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
	terminfo.c tparm.c graphics.c
libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1

# Stage 2 and Stage 1.5's.
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec

if DISKLESS_SUPPORT
pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
	nbgrub pxegrub
noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
else
pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
noinst_DATA = pre_stage2 start start_eltorito
noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
	xfs_stage1_5.exec
endif
MOSTLYCLEANFILES = $(noinst_PROGRAMS)

PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00

if NETBOOT_SUPPORT
NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
else
NETBOOT_FLAGS =
endif

if SERIAL_SUPPORT
SERIAL_FLAGS = -DSUPPORT_SERIAL=1
else
SERIAL_FLAGS =
endif

if HERCULES_SUPPORT
HERCULES_FLAGS = -DSUPPORT_HERCULES=1
else
HERCULES_FLAGS =
endif

if GRAPHICS_SUPPORT
GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
else
GRAPHICS_FLAGS =
endif

STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)

STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1

# For stage2 target.
pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
	graphics.c
pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)

if NETBOOT_SUPPORT
pre_stage2_exec_LDADD = ../netboot/libdrivers.a
endif

if DISKLESS_SUPPORT
BUILT_SOURCES = stage2_size.h diskless_size.h
else
BUILT_SOURCES = stage2_size.h
endif

CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)

stage2_size.h: pre_stage2
	-rm -f stage2_size.h
	set dummy `ls -l pre_stage2`; \
	echo "#define STAGE2_SIZE $$6" > stage2_size.h

start_exec_SOURCES = start.S
start_exec_CCASFLAGS = $(STAGE2_COMPILE)
start_exec_LDFLAGS = $(START_LINK)

# XXX: automake doesn't provide a way to specify dependencies for object
# files explicitly, so we must write this by a general Makefile scheme.
# If automake change the naming scheme for per-executable objects, this
# will be broken.
start_exec-start.$(OBJEXT): stage2_size.h

stage2: pre_stage2 start
	-rm -f stage2
	cat start pre_stage2 > stage2

start_eltorito_exec_SOURCES = start_eltorito.S
start_eltorito_exec_CCASFLAGS = $(STAGE2_COMPILE)
start_eltorito_exec_LDFLAGS = $(START_ELTORITO_LINK)

start_eltorito_exec-start.$(OBJEXT): stage2_size.h

stage2_eltorito: pre_stage2 start_eltorito
	-rm -f stage2_eltorito
	cat start_eltorito pre_stage2 > stage2_eltorito

# For e2fs_stage1_5 target.
e2fs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
	stage1_5.c fsys_ext2fs.c bios.c
e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
	-DNO_BLOCK_FILES=1
e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
	-DNO_BLOCK_FILES=1
e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For fat_stage1_5 target.
fat_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
	stage1_5.c fsys_fat.c bios.c
fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
	-DNO_BLOCK_FILES=1
fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
	-DNO_BLOCK_FILES=1
fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For ffs_stage1_5 target.
ffs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
	stage1_5.c fsys_ffs.c bios.c
ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
	-DNO_BLOCK_FILES=1
ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
	-DNO_BLOCK_FILES=1
ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For ufs2_stage1_5 target.
ufs2_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
	stage1_5.c fsys_ufs2.c bios.c
ufs2_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_UFS2=1 \
	-DNO_BLOCK_FILES=1
ufs2_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_UFS2=1 \
	-DNO_BLOCK_FILES=1
ufs2_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For minix_stage1_5 target.
minix_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
	stage1_5.c fsys_minix.c bios.c
minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
	-DNO_BLOCK_FILES=1
minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
	-DNO_BLOCK_FILES=1
minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For reiserfs_stage1_5 target.
reiserfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_reiserfs.c bios.c
reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
	-DNO_BLOCK_FILES=1
reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
	-DNO_BLOCK_FILES=1
reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For vstafs_stage1_5 target.
vstafs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_vstafs.c bios.c
vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
	-DNO_BLOCK_FILES=1
vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
	-DNO_BLOCK_FILES=1
vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For jfs_stage1_5 target.
jfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_jfs.c bios.c
jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
	-DNO_BLOCK_FILES=1
jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
	-DNO_BLOCK_FILES=1
jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For xfs_stage1_5 target.
xfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_xfs.c bios.c
xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
	-DNO_BLOCK_FILES=1
xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
	-DNO_BLOCK_FILES=1
xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For iso9660_stage1_5 target.
iso9660_stage1_5_exec_SOURCES = start_eltorito.S asm.S common.c char_io.c \
	disk_io.c stage1_5.c fsys_iso9660.c bios.c
iso9660_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_ISO9660=1 \
	-DNO_BLOCK_FILES=1
iso9660_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_ISO9660=1 \
	-DNO_BLOCK_FILES=1
iso9660_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)

# For diskless target.
diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
	-DSUPPORT_DISKLESS=1
diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
	-DSUPPORT_DISKLESS=1
diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
diskless_exec_LDADD = ../netboot/libdrivers.a

diskless_size.h: diskless
	-rm -f $@
	set dummy `ls -l $^`; \
	echo "#define DISKLESS_SIZE $$6" > $@

# For nbloader target.
nbloader_exec_SOURCES = nbloader.S
nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
nbloader_exec_LDFLAGS = $(NBLOADER_LINK)

# XXX: See the comment for start_exec-start.o.
nbloader_exec-nbloader.$(OBJEXT): diskless_size.h

# For nbgrub target.
nbgrub: nbloader diskless
	-rm -f $@
	cat $^ > $@

# For pxeloader target.
pxeloader_exec_SOURCES = pxeloader.S
pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)

# XXX: See the comment for start_exec-start.o.
pxeloader_exec-pxeloader.$(OBJEXT): diskless_size.h

# For pxegrub target.
pxegrub: pxeloader diskless
	-rm -f $@
	cat $^ > $@

# General rule for making a raw binary.
SUFFIXES = .exec
.exec:
	$(OBJCOPY) -O binary $< $@

Lines 4067-4072 Link Here

(-)grub-0.96.orig/stage2/builtins.c (+1 lines)
4067	{"jfs", "/jfs_stage1_5"},	4067	{"jfs", "/jfs_stage1_5"},
4068	{"minix", "/minix_stage1_5"},	4068	{"minix", "/minix_stage1_5"},
4069	{"reiserfs", "/reiserfs_stage1_5"},	4069	{"reiserfs", "/reiserfs_stage1_5"},
		4070	{"reiser4", "/reiser4_stage1_5"},
4070	{"vstafs", "/vstafs_stage1_5"},	4071	{"vstafs", "/vstafs_stage1_5"},
4071	{"xfs", "/xfs_stage1_5"}	4072	{"xfs", "/xfs_stage1_5"}
4072	};	4073	};




/* The default entry.  */
int default_entry = 0;
/* The fallback entry.  */
int fallback_entryno;
int fallback_entries[MAX_FALLBACK_ENTRIES];
/* The number of current entry.  */
int current_entryno;
/* The address for Multiboot command-line buffer.  */

{
  default_entry = 0;
  password = 0;
  fallback_entryno = -1;
  fallback_entries[0] = -1;
  grub_timeout = -1;
}


}


/* blocklist_read_helper nee disk_read_blocklist_func was a nested
 * function, to which pointers were taken and exposed globally.  Even
 * in the GNU-C nested functions extension, they have local linkage,
 * and aren't guaranteed to be accessable *at all* outside of their 
 * containing scope.
 *
 * Above and beyond all of that, the variables within blocklist_func_context
 * are originally local variables, with local (not even static) linkage,
 * from within blocklist_func.  These were each referenced by
 * disk_read_blocklist_func, which is only called from other functions
 * through a globally scoped pointer.
 * 
 * The documentation in GCC actually uses the words "all hell will break
 * loose" to describe this scenario.
 *
 * Also, "start_sector" was also used uninitialized, but gcc doesn't warn
 * about it (possibly because of the scoping madness?)
 */
   
static struct {
       int start_sector;
       int num_sectors;
       int num_entries;
       int last_length;
} blocklist_func_context = {
       .start_sector = 0,
       .num_sectors = 0,
       .num_entries = 0,
       .last_length = 0
};

/* Collect contiguous blocks into one entry as many as possible,
   and print the blocklist notation on the screen.  */
static void
blocklist_read_helper (int sector, int offset, int length)
{
  int *start_sector = &blocklist_func_context.start_sector;
  int *num_sectors = &blocklist_func_context.num_sectors;
  int *num_entries = &blocklist_func_context.num_entries;
  int *last_length = &blocklist_func_context.last_length;

  if (*num_sectors > 0)
  {
    if (*start_sector + *num_sectors == sector
      && offset == 0 && *last_length == SECTOR_SIZE)
    {
      *num_sectors++;
      *last_length = length;
      return;
    }
    else
    {
      if (*last_length == SECTOR_SIZE)
        grub_printf ("%s%d+%d", *num_entries ? "," : "",
          *start_sector - part_start, *num_sectors);
      else if (*num_sectors > 1)
        grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "",
          *start_sector - part_start, *num_sectors-1,
          *start_sector + *num_sectors-1 - part_start, 
          *last_length);
      else
        grub_printf ("%s%d[0-%d]", *num_entries ? "," : "",
          *start_sector - part_start, *last_length);
      *num_entries++;
      *num_sectors = 0;
    }
  }

  if (offset > 0)
  {
    grub_printf("%s%d[%d-%d]", *num_entries ? "," : "",
          sector-part_start, offset, offset+length);
    *num_entries++;
  }
  else
  {
    *start_sector = sector;
    *num_sectors = 1;
    *last_length = length;
  }
}

/* blocklist */
static int
blocklist_func (char *arg, int flags)
{
  char *dummy = (char *) RAW_ADDR (0x100000);
  int start_sector;
  int num_sectors = 0;
  int num_entries = 0;
  int last_length = 0;

  /* Collect contiguous blocks into one entry as many as possible,
     and print the blocklist notation on the screen.  */
  static void disk_read_blocklist_func (int sector, int offset, int length)
    {
      if (num_sectors > 0)
	{
	  if (start_sector + num_sectors == sector
	      && offset == 0 && last_length == SECTOR_SIZE)
	    {
	      num_sectors++;
	      last_length = length;
	      return;
	    }
	  else
	    {
	      if (last_length == SECTOR_SIZE)
		grub_printf ("%s%d+%d", num_entries ? "," : "",
			     start_sector - part_start, num_sectors);
	      else if (num_sectors > 1)
		grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "",
			     start_sector - part_start, num_sectors-1,
			     start_sector + num_sectors-1 - part_start, 
			     last_length);
	      else
		grub_printf ("%s%d[0-%d]", num_entries ? "," : "",
			     start_sector - part_start, last_length);
	      num_entries++;
	      num_sectors = 0;
	    }
	}

      if (offset > 0)
	{
	  grub_printf("%s%d[%d-%d]", num_entries ? "," : "",
		      sector-part_start, offset, offset+length);
	  num_entries++;
	}
      else
	{
	  start_sector = sector;
	  num_sectors = 1;
	  last_length = length;
	}
    }

  int *start_sector = &blocklist_func_context.start_sector;
  int *num_sectors = &blocklist_func_context.num_sectors;
  int *num_entries = &blocklist_func_context.num_entries;
  
  /* Open the file.  */
  if (! grub_open (arg))
    return 1;

  grub_printf (")");

  /* Read in the whole file to DUMMY.  */
  disk_read_hook = blocklist_read_helper;
  if (! grub_read (dummy, -1))
    goto fail;

  /* The last entry may not be printed yet.  Don't check if it is a
   * full sector, since it doesn't matter if we read too much. */
  if (*num_sectors > 0)
	grub_printf ("%s%d+%d", *num_entries ? "," : "",
                *start_sector - part_start, *num_sectors);

  grub_printf ("\n");
  

    "white"
  };

  auto int color_number (char *str);
  
  /* Convert the color name STR into the magical number.  */
  auto int color_number (char *str)
    {
      char *ptr;
      int i;

};
#endif /* SUPPORT_NETBOOT */

static int terminal_func (char *arg, int flags);

#ifdef SUPPORT_GRAPHICS

static int splashimage_func(char *arg, int flags) {
    char splashimage[64];
    int i;
    
    /* filename can only be 64 characters due to our buffer size */
    if (strlen(arg) > 63)
	return 1;
    if (flags == BUILTIN_CMDLINE) {
	if (!grub_open(arg))
	    return 1;
	grub_close();
    }

    strcpy(splashimage, arg);

    /* get rid of TERM_NEED_INIT from the graphics terminal. */
    for (i = 0; term_table[i].name; i++) {
	if (grub_strcmp (term_table[i].name, "graphics") == 0) {
	    term_table[i].flags &= ~TERM_NEED_INIT;
	    break;
	}
    }
    
    graphics_set_splash(splashimage);

    if (flags == BUILTIN_CMDLINE && graphics_inited) {
	graphics_end();
	graphics_init();
	graphics_cls();
    }

    /* FIXME: should we be explicitly switching the terminal as a 
     * side effect here? */
    terminal_func("graphics", flags);

    return 0;
}

static struct builtin builtin_splashimage =
{
  "splashimage",
  splashimage_func,
  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
  "splashimage FILE",
  "Load FILE as the background image when in graphics mode."
};


/* foreground */
static int
foreground_func(char *arg, int flags)
{
    if (grub_strlen(arg) == 6) {
	int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2;
	int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2;
	int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2;

	foreground = (r << 16) | (g << 8) | b;
	if (graphics_inited)
	    graphics_set_palette(15, r, g, b);

	return (0);
    }

    return (1);
}

static struct builtin builtin_foreground =
{
  "foreground",
  foreground_func,
  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
  "foreground RRGGBB",
  "Sets the foreground color when in graphics mode."
  "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal."
};


/* background */
static int
background_func(char *arg, int flags)
{
    if (grub_strlen(arg) == 6) {
	int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2;
	int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2;
	int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2;

	background = (r << 16) | (g << 8) | b;
	if (graphics_inited)
	    graphics_set_palette(0, r, g, b);
	return (0);
    }

    return (1);
}

static struct builtin builtin_background =
{
  "background",
  background_func,
  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
  "background RRGGBB",
  "Sets the background color when in graphics mode."
  "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal."
};

#endif /* SUPPORT_GRAPHICS */


/* clear */
static int 
clear_func() 
{
  if (current_term->cls)
    current_term->cls();

  return 0;
}

static struct builtin builtin_clear =
{
  "clear",
  clear_func,
  BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
  "clear",
  "Clear the screen"
};


/* displayapm */
static int

static int
fallback_func (char *arg, int flags)
{
  int i = 0;

  while (*arg)
    {
      int entry;
      int j;
      
      if (! safe_parse_maxint (&arg, &entry))
	return 1;

      /* Remove duplications to prevent infinite looping.  */
      for (j = 0; j < i; j++)
	if (entry == fallback_entries[j])
	  break;
      if (j != i)
	continue;
      
      fallback_entries[i++] = entry;
      if (i == MAX_FALLBACK_ENTRIES)
	break;
      
      arg = skip_to (0, arg);
    }

  if (i < MAX_FALLBACK_ENTRIES)
    fallback_entries[i] = -1;

  fallback_entryno = (i == 0) ? -1 : 0;
  
  return 0;
}


  fallback_func,
  BUILTIN_MENU,
#if 0
  "fallback NUM...",
  "Go into unattended boot mode: if the default boot entry has any"
  " errors, instead of waiting for the user to do anything, it"
  " immediately starts over using the NUM entry (same numbering as the"



/* install */
static struct {
       int saved_sector;
       int installaddr;
       int installlist;
       char *stage2_first_buffer;
} install_func_context = {
       .saved_sector = 0,
       .installaddr = 0,
       .installlist = 0,
       .stage2_first_buffer = NULL,
};

/* Save the first sector of Stage2 in STAGE2_SECT.  */
/* Formerly disk_read_savesect_func with local scope inside install_func */
static void
install_savesect_helper(int sector, int offset, int length)
{
  if (debug)
    printf ("[%d]", sector);

  /* ReiserFS has files which sometimes contain data not aligned
     on sector boundaries.  Returning an error is better than
     silently failing. */
  if (offset != 0 || length != SECTOR_SIZE)
    errnum = ERR_UNALIGNED;

  install_func_context.saved_sector = sector;
}

/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and  INSTALLSECT.  */
/* Formerly disk_read_blocklist_func with local scope inside install_func */
static void
install_blocklist_helper (int sector, int offset, int length)
{
  int *installaddr = &install_func_context.installaddr;
  int *installlist = &install_func_context.installlist;
  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
  /* Was the last sector full? */
  static int last_length = SECTOR_SIZE;

  if (debug)
    printf("[%d]", sector);

  if (offset != 0 || last_length != SECTOR_SIZE)
    {
      /* We found a non-sector-aligned data block. */
      errnum = ERR_UNALIGNED;
      return;
    }

  last_length = length;

  if (*((unsigned long *) (*installlist - 4))
      + *((unsigned short *) *installlist) != sector
      || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4)
    {
      *installlist -= 8;

      if (*((unsigned long *) (*installlist - 8)))
        errnum = ERR_WONT_FIT;
      else
        {
          *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4);
          *((unsigned long *) (*installlist - 4)) = sector;
        }
    }

  *((unsigned short *) *installlist) += 1;
  *installaddr += 512;
}

static int
install_func (char *arg, int flags)
{

  char *stage1_buffer = (char *) RAW_ADDR (0x100000);
  char *stage2_buffer = stage1_buffer + SECTOR_SIZE;
  char *old_sect = stage2_buffer + SECTOR_SIZE;
  /* stage2_first_buffer used to be defined as:
   * char *stage2_first_buffer = old_sect + SECTOR_SIZE;  */
  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
  /* and stage2_second_buffer was:
   * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */
  char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE;
  /* XXX: Probably SECTOR_SIZE is reasonable.  */
  char *config_filename = stage2_second_buffer + SECTOR_SIZE;
  char *dummy = config_filename + SECTOR_SIZE;
  int new_drive = GRUB_INVALID_DRIVE;
  int dest_drive, dest_partition, dest_sector;
  int src_drive, src_partition, src_part_start;
  int i;
  struct geometry dest_geom, src_geom;
  int *saved_sector = &install_func_context.saved_sector;
  int stage2_first_sector, stage2_second_sector;
  char *ptr;
  int *installaddr = &install_func_context.installaddr;
  int *installlist = &install_func_context.installlist;
  /* Point to the location of the name of a configuration file in Stage 2.  */
  char *config_file_location;
  /* If FILE is a Stage 1.5?  */

  int is_open = 0;
  /* If LBA is forced?  */
  int is_force_lba = 0;
  /* Was the last sector full? */
  int last_length = SECTOR_SIZE;
  
#ifdef GRUB_UTIL
  /* If the Stage 2 is in a partition mounted by an OS, this will store
     the filename under the OS.  */
  char *stage2_os_file = 0;
#endif /* GRUB_UTIL */
  
  /* Save the first sector of Stage2 in STAGE2_SECT.  */
  static void disk_read_savesect_func (int sector, int offset, int length)
    {
      if (debug)
	printf ("[%d]", sector);

      /* ReiserFS has files which sometimes contain data not aligned
         on sector boundaries.  Returning an error is better than
         silently failing. */
      if (offset != 0 || length != SECTOR_SIZE)
	errnum = ERR_UNALIGNED;

  *stage2_first_buffer = old_sect + SECTOR_SIZE;
    }

  /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
     INSTALLSECT.  */
  static void disk_read_blocklist_func (int sector, int offset, int length)
    {
      if (debug)
	printf("[%d]", sector);

      if (offset != 0 || last_length != SECTOR_SIZE)
	{
	  /* We found a non-sector-aligned data block. */
	  errnum = ERR_UNALIGNED;
	  return;
	}

      last_length = length;

      if (*((unsigned long *) (installlist - 4))
	  + *((unsigned short *) installlist) != sector
	  || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4)
	{
	  installlist -= 8;

	  if (*((unsigned long *) (installlist - 8)))
	    errnum = ERR_WONT_FIT;
	  else
	    {
	      *((unsigned short *) (installlist + 2)) = (installaddr >> 4);
	      *((unsigned long *) (installlist - 4)) = sector;
	    }
	}

      *((unsigned short *) installlist) += 1;
      installaddr += 512;
    }

  /* First, check the GNU-style long option.  */
  while (1)

  addr = skip_to (0, file);

  /* Get the installation address.  */
  if (! safe_parse_maxint (&addr, installaddr))
    {
      /* ADDR is not specified.  */
      *installaddr = 0;
      ptr = addr;
      errnum = 0;
    }

    = (dest_drive & BIOS_FLAG_FIXED_DISK);
  
  /* Read the first sector of Stage 2.  */
  disk_read_hook = install_savesect_helper;
  if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
    goto fail;

  stage2_first_sector = *saved_sector;
  
  /* Read the second sector of Stage 2.  */
  if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE)
    goto fail;

  stage2_second_sector = *saved_sector;
  
  /* Check for the version of Stage 2.  */
  if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS))


  /* If INSTALLADDR is not specified explicitly in the command-line,
     determine it by the Stage 2 id.  */
  if (! *installaddr)
    {
      if (! is_stage1_5)
	/* Stage 2.  */
	*installaddr = 0x8000;
      else
	/* Stage 1.5.  */
	*installaddr = 0x2000;
    }

  *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR))
    = stage2_first_sector;
  *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS))
    = *installaddr;
  *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT))
    = *installaddr >> 4;

  i = (int) *stage2_first_buffer + SECTOR_SIZE - 4;
  while (*((unsigned long *) i))
    {
      if (i < (int) *stage2_first_buffer
	  || (*((int *) (i - 4)) & 0x80000000)
	  || *((unsigned short *) i) >= 0xA00
	  || *((short *) (i + 2)) == 0)

      i -= 8;
    }

  *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4;
  *installaddr += SECTOR_SIZE;
  
  /* Read the whole of Stage2 except for the first sector.  */
  grub_seek (SECTOR_SIZE);

  disk_read_hook = install_blocklist_helper;
  if (! grub_read (dummy, -1))
    goto fail;
  

	      /* If the drive where the Stage 2 resides is the same as
		 the one where the Stage 1.5 resides, do not embed the
		 drive number.  */
	      current_drive = GRUB_INVALID_DRIVE;
	    }

	  device = (current_drive << 24) | current_partition;

	  /* Skip the first sector.  */
	  grub_seek (SECTOR_SIZE);
	  
	  disk_read_hook = install_savesect_helper;
	  if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE)
	    goto fail;
	  

	  else
#endif /* GRUB_UTIL */
	    {
	      if (! devwrite (*saved_sector - part_start, 1, stage2_buffer))
		goto fail;
	    }
	}

	  goto fail;
	}

      if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
	{
	  fclose (fp);
	  errnum = ERR_WRITE;

	goto fail;

      if (! devwrite (stage2_first_sector - src_part_start, 1,
		      *stage2_first_buffer))
	goto fail;

      if (! devwrite (stage2_second_sector - src_part_start, 1,

savedefault_func (char *arg, int flags)
{
#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
  unsigned long tmp_drive = saved_drive;
  unsigned long tmp_partition = saved_partition;
  char *default_file = (char *) DEFAULT_FILE_BUF;
  char buf[10];
  char sect[SECTOR_SIZE];
  int entryno;
  int sector_count = 0;
  int saved_sectors[2];
  int saved_offsets[2];
  int saved_lengths[2];

  /* Save sector information about at most two sectors.  */
  auto void disk_read_savesect_func (int sector, int offset, int length);
  void disk_read_savesect_func (int sector, int offset, int length)
    {
      if (sector_count < 2)
	{
	  saved_sectors[sector_count] = sector;
	  saved_offsets[sector_count] = offset;
	  saved_lengths[sector_count] = length;
	}
      sector_count++;
    }
  
  /* This command is only useful when you boot an entry from the menu
     interface.  */

      errnum = ERR_UNRECOGNIZED;
      return 1;
    }
  
  /* Get the geometry of the boot drive (i.e. the disk which contains
     this stage2).  */
  if (get_diskinfo (boot_drive, &buf_geom))
    {
      errnum = ERR_NO_DISK;
      return 1;
    }

  /* Determine a saved entry number.  */
  if (*arg)
    {
      if (grub_memcmp (arg, "fallback", sizeof ("fallback") - 1) == 0)
	{
	  int i;
	  int index = 0;
	  
	  for (i = 0; i < MAX_FALLBACK_ENTRIES; i++)
	    {
	      if (fallback_entries[i] < 0)
		break;
	      if (fallback_entries[i] == current_entryno)
		{
		  index = i + 1;
		  break;
		}
	    }
	  
	  if (index >= MAX_FALLBACK_ENTRIES || fallback_entries[index] < 0)
	    {
	      /* This is the last.  */
	      errnum = ERR_BAD_ARGUMENT;
	      return 1;
	    }

	  entryno = fallback_entries[index];
	}
      else if (! safe_parse_maxint (&arg, &entryno))
	return 1;
      errnum = ERR_BAD_VERSION;
      return 1;
    }
  else
    entryno = current_entryno;

  /* Open the default file.  */
  saved_drive = boot_drive;
  saved_partition = install_partition;
  if (grub_open (default_file))
    {
      int len;
      
      disk_read_hook = disk_read_savesect_func;
      len = grub_read (buf, sizeof (buf));
      disk_read_hook = 0;
      grub_close ();
      
      if (len != sizeof (buf))
	{
	  /* This is too small. Do not modify the file manually, please!  */
	  errnum = ERR_READ;
	  goto fail;
	}

      if (sector_count > 2)
	{
	  /* Is this possible?! Too fragmented!  */
	  errnum = ERR_FSYS_CORRUPT;
	  goto fail;
	}
      
      /* Set up a string to be written.  */
      grub_memset (buf, '\n', sizeof (buf));
      grub_sprintf (buf, "%d", entryno);
      
      if (saved_lengths[0] < sizeof (buf))
	{
	  /* The file is anchored to another file and the first few bytes
	     are spanned in two sectors. Uggh...  */
	  if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
			 sect))
	    goto fail;
	  grub_memmove (sect + saved_offsets[0], buf, saved_lengths[0]);
	  if (! rawwrite (current_drive, saved_sectors[0], sect))
	    goto fail;

	  if (! rawread (current_drive, saved_sectors[1], 0, SECTOR_SIZE,
			 sect))
	    goto fail;
	  grub_memmove (sect + saved_offsets[1],
			buf + saved_lengths[0],
			sizeof (buf) - saved_lengths[0]);
	  if (! rawwrite (current_drive, saved_sectors[1], sect))
	    goto fail;
	}
      else
	{
	  /* This is a simple case. It fits into a single sector.  */
	  if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
			 sect))
	    goto fail;
	  grub_memmove (sect + saved_offsets[0], buf, sizeof (buf));
	  if (! rawwrite (current_drive, saved_sectors[0], sect))
	    goto fail;
	}

      /* Clear the cache.  */
      buf_track = -1;
    }

 fail:
  saved_drive = tmp_drive;
  saved_partition = tmp_partition;
  return errnum;
#else /* ! SUPPORT_DISKLESS && ! GRUB_UTIL */
  errnum = ERR_UNRECOGNIZED;
  return 1;

  "savedefault",
  savedefault_func,
  BUILTIN_CMDLINE,
  "savedefault [NUM | `fallback']",
  "Save the current entry as the default boot entry if no argument is"
  " specified. If a number is specified, this number is saved. If"
  " `fallback' is used, next fallback entry is saved."
};



  int to_code, from_code;
  int map_in_interrupt = 0;
  
  auto int find_key_code (char *key);
  auto int find_ascii_code (char *key);
  
  auto int find_key_code (char *key)
    {
      int i;


      return 0;
    }
  
  auto int find_ascii_code (char *key)
    {
      int i;
      

  {
    {"ext2fs",   "/e2fs_stage1_5"},
    {"fat",      "/fat_stage1_5"},
    {"ufs2",     "/ufs2_stage1_5"},
    {"ffs",      "/ffs_stage1_5"},
    {"iso9660",  "/iso9660_stage1_5"},
    {"jfs",      "/jfs_stage1_5"},
    {"minix",    "/minix_stage1_5"},
    {"reiserfs", "/reiserfs_stage1_5"},

};


#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS)
/* terminal */
static int
terminal_func (char *arg, int flags)

 end:
  current_term = term_table + default_term;
  current_term->flags = term_flags;

  if (lines)
    max_lines = lines;
  else
    max_lines = current_term->max_lines;

  
  /* If the interface is currently the command-line,
     restart it to repaint the screen.  */
  if ((current_term != prev_term) && (flags & BUILTIN_CMDLINE)){
    if (prev_term->shutdown)
      prev_term->shutdown();
    if (current_term->startup)
      current_term->startup();
    grub_longjmp (restart_cmdline_env, 0);
  }
  
  return 0;
}

  "terminal",
  terminal_func,
  BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
  "terminal [--dumb] [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial] [hercules] [graphics]",
  "Select a terminal. When multiple terminals are specified, wait until"
  " you push any key to continue. If both console and serial are specified,"
  " the terminal to which you input a key first will be selected. If no"

  " seconds. The option --lines specifies the maximum number of lines."
  " The option --silent is used to suppress messages."
};
#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */


#ifdef SUPPORT_SERIAL

/* The table of builtin commands. Sorted in dictionary order.  */
struct builtin *builtin_table[] =
{
#ifdef SUPPORT_GRAPHICS
  &builtin_background,
#endif
  &builtin_blocklist,
  &builtin_boot,
#ifdef SUPPORT_NETBOOT

#endif /* SUPPORT_NETBOOT */
  &builtin_cat,
  &builtin_chainloader,
  &builtin_clear,
  &builtin_cmp,
  &builtin_color,
  &builtin_configfile,

  &builtin_embed,
  &builtin_fallback,
  &builtin_find,
#ifdef SUPPORT_GRAPHICS
  &builtin_foreground,
#endif
  &builtin_fstest,
  &builtin_geometry,
  &builtin_halt,

#endif /* SUPPORT_SERIAL */
  &builtin_setkey,
  &builtin_setup,
#ifdef SUPPORT_GRAPHICS
  &builtin_splashimage,
#endif /* SUPPORT_GRAPHICS */
#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS)
  &builtin_terminal,
#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */
#ifdef SUPPORT_SERIAL
  &builtin_terminfo,
#endif /* SUPPORT_SERIAL */

Lines 63-68 Link Here

(-)grub-0.96.orig/stage2/disk_io.c (+3 lines)
63	# ifdef FSYS_REISERFS	63	# ifdef FSYS_REISERFS
64	{"reiserfs", reiserfs_mount, reiserfs_read, reiserfs_dir, 0, reiserfs_embed},	64	{"reiserfs", reiserfs_mount, reiserfs_read, reiserfs_dir, 0, reiserfs_embed},
65	# endif	65	# endif
		66	# ifdef FSYS_REISER4
		67	{"reiser4", reiser4_mount, reiser4_read, reiser4_dir, 0, reiser4_embed},
		68	# endif
66	# ifdef FSYS_VSTAFS	69	# ifdef FSYS_VSTAFS
67	{"vstafs", vstafs_mount, vstafs_read, vstafs_dir, 0, 0},	70	{"vstafs", vstafs_mount, vstafs_read, vstafs_dir, 0, 0},
68	# endif	71	# endif




#define FSYS_REISERFS_NUM 0
#endif

#ifdef FSYS_REISER4
#define FSYS_REISER4_NUM 1
int reiser4_mount (void);
int reiser4_read (char *buf, int len);
int reiser4_dir (char *dirname);
int reiser4_embed (int *start_sector, int needed_sectors);
#else
#define FSYS_REISER4_NUM 0
#endif

#ifdef FSYS_VSTAFS
#define FSYS_VSTAFS_NUM 1
int vstafs_mount (void);

#ifndef NUM_FSYS
#define NUM_FSYS	\
  (FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM + FSYS_MINIX_NUM	\
   + FSYS_REISERFS_NUM + FSYS_REISER4_NUM + FSYS_VSTAFS_NUM + FSYS_JFS_NUM \
   + FSYS_XFS_NUM + FSYS_TFTP_NUM + FSYS_ISO9660_NUM + FSYS_UFS2_NUM)
#endif

/* defines for the block filesystem info area */




/* 
 *  fsys_reiser4.c -- reiser4 filesystem support.
 *  Copyright (C) 2000, 2001   Free Software Foundation, Inc.
 *  
 *  GRUB  --  GRand Unified Bootloader
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#ifdef FSYS_REISER4
#include "shared.h"
#include "filesys.h"

#define ENABLE_MINIMAL
#include <reiser4/libreiser4.h>

static reiser4_fs_t *fs = NULL;
static aal_device_t *dev = NULL;
static reiser4_object_t *object = NULL;

/* Read callback of grub specific device. It uses devread() for reading passed
   @count of device blocks starting from @blk to passed @buff. */
static errno_t grub_dev_read(aal_device_t *device,
			     void *buff, blk_t blk,
			     count_t count)
{
	unsigned int size;
	unsigned int factor;
	unsigned int sector;

	/* Calculating actual sector and size in bytes to be read from
	   device. */
	factor = device->blksize / SECTOR_SIZE;
	sector = (unsigned int)blk << aal_log2(factor);
	size = (unsigned int)count * (SECTOR_SIZE * factor);
	
	/* Reading from the current device */
        if (!devread(sector, 0, size, buff))
    	        return -EIO;
		
	return 0;
}

/* Length callback of grub device */
static count_t grub_dev_len(aal_device_t *device) {
	unsigned int factor;

	/* Getting partition length in device blocks */
	factor = device->blksize / SECTOR_SIZE;
	return (part_length >> aal_log2(factor));
}

/*
  Initializing grub device abstraction instance. It will use devread and friends
  for providing needed functionality.
*/
struct aal_device_ops grub_dev_ops = {
	.read   = grub_dev_read,
	.len    = grub_dev_len
};

/* Initializes reiser4 */
static int reiser4_init(void) {
	extern aal_hash_table_t *plugins;
	
	plugins = NULL;

	/* Initializing memory manager */
	aal_mem_init((void *)FSYS_BUF, FSYS_BUFLEN);

	/* Initializing device abstraction on current device GRUB uses. */
	if (!(dev = aal_device_open(&grub_dev_ops, NULL,
				    SECTOR_SIZE, 0)))
	{
		return 0;
	}

	/* Initializing libreiser4 (plugins, etc) */
	return !libreiser4_init();
}

#define MEMORY_WATERMARK 8192

/* Memory pressure detect function. */
static int mpressure_detect(reiser4_tree_t *tree) {
	return (aal_mem_free() <= MEMORY_WATERMARK);
}

/* Reiser4 mount() routine */
int reiser4_mount(void) {
	
	/* Initialize all reiser4 related stuff first */
	if (!reiser4_init())
		return 0;
	
	/* Open filesystem on @dev. */
	if (!(fs = reiser4_fs_open(dev)))
		return 0;

	fs->tree->mpc_func = mpressure_detect;
	
	object = NULL;
	return 1;
}

/* Reiser4 read() handler */
int reiser4_read(char *buf, int len) {
	int64_t read;

	if (object == NULL)
		return 0;

	/* Seet at current position denoted by @filepos */
	if (objplug(object)->o.object_ops->seek) {
		plug_call(objplug(object)->o.object_ops,
			  seek, object->ent, filepos);
	}
	
	/* Reading current file data starting from @filepos */
	disk_read_func = disk_read_hook;
	read = objplug(object)->o.object_ops->read ?
		plug_call(objplug(object)->o.object_ops, read, 
			  object->ent, buf, len) : -EINVAL;
	disk_read_func = NULL;

	if (read < 0) {
		errnum = ERR_FSYS_CORRUPT;
		return 0;
	}

    	filepos += read;
	return read;
}

/* Reiser4 file open() routine */
int reiser4_dir(char *dirname) {
	char *ch;
	
	if (fs == NULL)
		return 0;

	if (object != NULL) {
		plug_call(objplug(object)->o.object_ops, 
			  close, object->ent);
		aal_free(object);
		object = NULL;
	}

	/* Cutting out string after first space character */
    	if ((ch = aal_strchr(dirname, ' ')))
		*ch = '\0';
		
	/* This function is also called for getting directory list for
	   maintaining the bash-like completion. */
#ifndef STAGE1_5
	if (print_possibilities) {
		char entry[256];
		entry_hint_t entry_hint;
		
		/* Getting last part of name (jsut after last '/') */
		if (*(dirname + aal_strlen(dirname) - 1) != '/') {
		
			if (!(ch = aal_strrchr(dirname, '/'))) {
				errnum = ERR_BAD_FILETYPE;
				return 0;
			}

			aal_strncpy(entry, ch + 1, sizeof(entry));
			*(ch + 1) = '\0';
		} else {
			aal_memset(entry, 0, sizeof(entry));
		}

		/* Open obejct by @dirname */
		if (!(object = reiser4_semantic_open(fs->tree, dirname, 
						     NULL, 1))) 
		{
			errnum = ERR_FILE_NOT_FOUND;
			return 0;
		}

		/* Checking if it is a directory object */
		if (object->ent->opset.plug[OPSET_OBJ]->id.group != DIR_OBJECT)
		{
			/* If not, cutting out last '/' character */
    			if ((ch = aal_strrchr(dirname, '/')))
				*ch = '\0';

			/* Close current object */
			plug_call(objplug(object)->o.object_ops, 
				  close, object->ent);
			aal_free(object);
			return 0;
		}
		
		/* Reading the opened directory to build the completion list. */
		if (objplug(object)->o.object_ops->readdir) {
			while (plug_call(objplug(object)->o.object_ops, readdir,
					 object->ent, &entry_hint) > 0) 
			{
				if (substring(entry, entry_hint.name) <= 0) {
					if (print_possibilities > 0)
						print_possibilities = 
							-print_possibilities;
				
					print_a_completion(entry_hint.name);
				}
			}
		}
	} else {
#endif
		/* This is the case when resier4_dir() is called for open the
		   file @dirname, not for building completion list. */
		if (!(object = reiser4_semantic_open(fs->tree, dirname,
						     NULL, 1))) 
		{
			errnum = ERR_FILE_NOT_FOUND;
			return 0;
		}
		
		if (object->ent->opset.plug[OPSET_OBJ]->id.group != REG_OBJECT)
		{
			errnum = ERR_BAD_FILETYPE;
			return 0;
		}
		
		/* Initializing GRUB global variables @filepos and @filemax. */
		filepos = 0;
		filemax = reiser4_object_size(object);
	
		return 1;
#ifndef STAGE1_5
	}

	return 1;
#endif

	errnum = ERR_FILE_NOT_FOUND;
	return 0;
}

/* Returns how many sectors may be used for embeding reiser4_stage1_5 in teh
   case of installing GRUB to partition instead of MBR. */
int reiser4_embed (int *start_sector, int needed_sectors) {
	*start_sector = 1;
	return needed_sectors <= ((REISER4_MASTER_OFFSET >> SECTOR_BITS) - 1);
}
#endif /* FSYS_REISER4 */

Lines 207-217 Link Here

(-)grub-0.96.orig/stage2/shared.h (-5 / +8 lines)
207	#define STAGE2_ID_FAT_STAGE1_5 3	207	#define STAGE2_ID_FAT_STAGE1_5 3
208	#define STAGE2_ID_MINIX_STAGE1_5 4	208	#define STAGE2_ID_MINIX_STAGE1_5 4
209	#define STAGE2_ID_REISERFS_STAGE1_5 5	209	#define STAGE2_ID_REISERFS_STAGE1_5 5
210	#define STAGE2_ID_VSTAFS_STAGE1_5 6	210	#define STAGE2_ID_REISER4_STAGE1_5 6
211	#define STAGE2_ID_JFS_STAGE1_5 7	211	#define STAGE2_ID_VSTAFS_STAGE1_5 7
212	#define STAGE2_ID_XFS_STAGE1_5 8	212	#define STAGE2_ID_JFS_STAGE1_5 8
213	#define STAGE2_ID_ISO9660_STAGE1_5 9	213	#define STAGE2_ID_XFS_STAGE1_5 9
214	#define STAGE2_ID_UFS2_STAGE1_5 10	214	#define STAGE2_ID_ISO9660_STAGE1_5 10
		215	#define STAGE2_ID_UFS2_STAGE1_5 11
215		216
216	#ifndef STAGE1_5	217	#ifndef STAGE1_5
217	# define STAGE2_ID STAGE2_ID_STAGE2	218	# define STAGE2_ID STAGE2_ID_STAGE2
Lines 226-231 Link Here
226	# define STAGE2_ID STAGE2_ID_MINIX_STAGE1_5	227	# define STAGE2_ID STAGE2_ID_MINIX_STAGE1_5
227	# elif defined(FSYS_REISERFS)	228	# elif defined(FSYS_REISERFS)
228	# define STAGE2_ID STAGE2_ID_REISERFS_STAGE1_5	229	# define STAGE2_ID STAGE2_ID_REISERFS_STAGE1_5
		230	# elif defined(FSYS_REISER4)
		231	# define STAGE2_ID STAGE2_ID_REISER4_STAGE1_5
229	# elif defined(FSYS_VSTAFS)	232	# elif defined(FSYS_VSTAFS)
230	# define STAGE2_ID STAGE2_ID_VSTAFS_STAGE1_5	233	# define STAGE2_ID STAGE2_ID_VSTAFS_STAGE1_5
231	# elif defined(FSYS_JFS)	234	# elif defined(FSYS_JFS)

Return to bug 69590

Lines 263-268 Link Here

(-)grub-0.96.orig/configure.ac (+71 lines)
263	FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"	263	FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1"
264	fi	264	fi
265		265
		266	dnl Checking for reiser4
		267	REISER4_LIBS=""
		268	REISER4_CFLAGS=""
		269
		270	OLD_LIBS=$LIBS
		271	OLD_CFLAGS=$CFLAGS
		272	LIBS=""
		273	CFLAGS=""
		274
		275	AC_ARG_ENABLE(reiser4,
		276	[ --disable-reiser4 disable Reiser4 support in Stage 2])
		277
		278	if test x"$enable_reiser4" != xno; then
		279	AC_CHECK_LIB(aal-minimal, aal_mem_init, ,
		280	AC_MSG_WARN(
		281	Reiser4 support is disabled due to inability find libaal-minimal with
		282	memory manager support turned on.)
		283	enable_reiser4=no
		284	)
		285	fi
		286
		287	if test x"$enable_reiser4" != xno; then
		288	AC_CHECK_HEADER(aal/libaal.h, ,
		289	AC_MSG_WARN(
		290	Libaal header files are not found. Reiser4 support is disabled
		291	)
		292	enable_reiser4=no)
		293	fi
		294
		295	if test x"$enable_reiser4" != xno; then
		296	AC_CHECK_LIB(reiser4-minimal, reiser4_fs_open, ,
		297	AC_MSG_WARN(
		298	Reiser4 support is disabled due to inability find valid libreiser4-minimal.)
		299	enable_reiser4=no,
		300	-laal-minimal
		301	)
		302	fi
		303
		304	if test x"$enable_reiser4" != xno; then
		305	AC_CHECK_HEADER(reiser4/libreiser4.h, ,
		306	AC_MSG_WARN(
		307	Reiser4 header files are not found. Reiser4 support is disabled.
		308	)
		309	enable_reiser4=no)
		310	fi
		311
		312	if test x"$enable_reiser4" != xno; then
		313	REISER4_CFLAGS="$REISER4_CFLAGS -DFSYS_REISER4=1"
		314	REISER4_LIBS=$LIBS
		315	fi
		316
		317	if test x"$enable_reiser4" != xno; then
		318	AC_CHECK_LIB(reiser4-minimal, __sym40_plug_init,
		319	REISER4_CFLAGS="$REISER4_CFLAGS -DENABLE_SYMLINKS=1",
		320	AC_MSG_WARN(Reiser4 symlinks support is disabled.),
		321	-laal-minimal
		322	)
		323	fi
		324
		325	LIBS=$OLD_LIBS
		326	CFLAGS=$OLD_CFLAGS
		327
		328	if test x"$enable_reiser4" != xno; then
		329	enable_reiser4_support=yes
330	FSYS_CFLAGS="$FSYS_CFLAGS $REISER4_CFLAGS"
331	fi
332
333	AC_SUBST(REISER4_LIBS)
334	AC_SUBST(REISER4_CFLAGS)
335	AM_CONDITIONAL(ENABLE_REISER4_SUPPORT, test x"$enable_reiser4" != xno)
336
266	AC_ARG_ENABLE(vstafs,	337	AC_ARG_ENABLE(vstafs,
267	[ --disable-vstafs disable VSTa FS support in Stage 2])	338	[ --disable-vstafs disable VSTa FS support in Stage 2])
268		339

Line 0 Link Here

(-)grub-0.96.orig/grub/Makefile.am.orig (+19 lines)
	1	sbin_PROGRAMS = grub
	2
	3	if SERIAL_SPEED_SIMULATION
	4	SERIAL_FLAGS = -DSUPPORT_SERIAL=1 -DSIMULATE_SLOWNESS_OF_SERIAL=1
	5	else
	6	SERIAL_FLAGS = -DSUPPORT_SERIAL=1
	7	endif
	8
	9	AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
	10	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
	11	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
	12	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_HERCULES=1 \
	13	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
	14	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
	15
	16	AM_CFLAGS = $(GRUB_CFLAGS)
	17
	18	grub_SOURCES = main.c asmstub.c
	19	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)

Lines 13-29 Link Here

(-)grub-0.96.orig/stage2/Makefile.am (-14 / +36 lines)
13	# For <stage1.h>.	13	# For <stage1.h>.
14	INCLUDES = -I$(top_srcdir)/stage1	14	INCLUDES = -I$(top_srcdir)/stage1
15		15
		16	if ENABLE_REISER4_SUPPORT
		17	REISER4_STAGE1_5 = reiser4_stage1_5
		18	REISER4_STAGE1_5_EXEC = reiser4_stage1_5.exec
		19	else
		20	REISER4_STAGE1_5 =
		21	REISER4_STAGE1_5_EXEC =
		22	endif
		23
16	# The library for /sbin/grub.	24	# The library for /sbin/grub.
17	noinst_LIBRARIES = libgrub.a	25	noinst_LIBRARIES = libgrub.a
18	libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \	26	libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
19	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \	27	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
20	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \	28	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_reiser4.c fsys_ufs2.c \
21	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \	29	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
22	terminfo.c tparm.c graphics.c	30	terminfo.c tparm.c graphics.c
23	libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \	31	libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
24	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \	32	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
25	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \	33	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
26	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \	34	$(REISER4_CFLAGS) -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
27	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1	35	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
28		36
29	# Stage 2 and Stage 1.5's.	37	# Stage 2 and Stage 1.5's.
Lines 34-57 Link Here
34	if DISKLESS_SUPPORT	42	if DISKLESS_SUPPORT
35	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \	43	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
36	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \	44	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
37	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \	45	reiserfs_stage1_5 $(REISER4_STAGE1_5) ufs2_stage1_5 \
38	nbgrub pxegrub	46	vstafs_stage1_5 xfs_stage1_5 nbgrub pxegrub
39	noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless	47	noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
40	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \	48	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
41	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \	49	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
42	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \	50	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
43	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \	51	reiserfs_stage1_5.exec $(REISER4_STAGE1_5_EXEC) ufs2_stage1_5.exec \
44	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec	52	vstafs_stage1_5.exec xfs_stage1_5.exec nbloader.exec pxeloader.exec \
		53	diskless.exec
45	else	54	else
46	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \	55	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
47	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \	56	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
48	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5	57	reiserfs_stage1_5 $(REISER4_STAGE1_5) ufs2_stage1_5 \
		58	vstafs_stage1_5 xfs_stage1_5
49	noinst_DATA = pre_stage2 start start_eltorito	59	noinst_DATA = pre_stage2 start start_eltorito
50	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \	60	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
51	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \	61	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
52	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \	62	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
53	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \	63	reiserfs_stage1_5.exec $(REISER4_STAGE1_5_EXEC) ufs2_stage1_5.exec \
54	xfs_stage1_5.exec	64	vstafs_stage1_5.exec xfs_stage1_5.exec
55	endif	65	endif
56	MOSTLYCLEANFILES = $(noinst_PROGRAMS)	66	MOSTLYCLEANFILES = $(noinst_PROGRAMS)
57		67
Lines 85-91 Link Here
85	GRAPHICS_FLAGS =	95	GRAPHICS_FLAGS =
86	endif	96	endif
87		97
88	STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \	98	STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin \
89	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)	99	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
90		100
91	STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000	101	STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
Lines 95-109 Link Here
95	pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \	105	pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
96	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \	106	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
97	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \	107	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
98	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \	108	fsys_reiserfs.c fsys_reiser4.c fsys_ufs2.c fsys_vstafs.c \
99	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \	109	fsys_xfs.c gunzip.c hercules.c md5.c serial.c smp-imps.c \
100	graphics.c	110	stage2.c terminfo.c tparm.c graphics.c
101	pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)	111	pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
102	pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)	112	pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
103	pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)	113	pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
104		114
105	if NETBOOT_SUPPORT	115	if NETBOOT_SUPPORT
106	pre_stage2_exec_LDADD = ../netboot/libdrivers.a	116	pre_stage2_exec_LDADD = ../netboot/libdrivers.a $(REISER4_LIBS)
		117	else
		118	pre_stage2_exec_LDADD = $(REISER4_LIBS)
107	endif	119	endif
108		120
109	if DISKLESS_SUPPORT	121	if DISKLESS_SUPPORT
Lines 197-202 Link Here
197	-DNO_BLOCK_FILES=1	209	-DNO_BLOCK_FILES=1
198	reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)	210	reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
199		211
		212	# For reiser4_stage1_5 target.
		213	reiser4_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
		214	disk_io.c stage1_5.c fsys_reiser4.c bios.c
		215	reiser4_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) $(REISER4_CFLAGS) \
		216	-DNO_BLOCK_FILES=1
		217	reiser4_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) $(REISER4_CFLAGS) \
		218	-DNO_BLOCK_FILES=1
		219	reiser4_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
		220	reiser4_stage1_5_exec_LDADD = $(REISER4_LIBS)
		221
200	# For vstafs_stage1_5 target.	222	# For vstafs_stage1_5 target.
201	vstafs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \	223	vstafs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
202	disk_io.c stage1_5.c fsys_vstafs.c bios.c	224	disk_io.c stage1_5.c fsys_vstafs.c bios.c

Line 0 Link Here

(-)grub-0.96.orig/stage2/Makefile.am.orig (+279 lines)
		1	# For test target.
		2	TESTS = size_test
		3	noinst_SCRIPTS = $(TESTS)
		4
		5	# For dist target.
		6	noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \
		7	fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
		8	imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
		9	nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
		10	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
		11	EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
		12
		13	# For <stage1.h>.
		14	INCLUDES = -I$(top_srcdir)/stage1
		15
		16	# The library for /sbin/grub.
		17	noinst_LIBRARIES = libgrub.a
		18	libgrub_a_SOURCES = boot.c builtins.c char_io.c cmdline.c common.c \
		19	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
		20	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
		21	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
		22	terminfo.c tparm.c graphics.c
		23	libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
		24	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
		25	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
		26	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
		27	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
		28
		29	# Stage 2 and Stage 1.5's.
		30	pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
		31
		32	EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
		33
		34	if DISKLESS_SUPPORT
		35	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
		36	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
		37	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
		38	nbgrub pxegrub
		39	noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
		40	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
		41	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
		42	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
		43	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
		44	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
		45	else
		46	pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
		47	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
		48	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
		49	noinst_DATA = pre_stage2 start start_eltorito
		50	noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
		51	e2fs_stage1_5.exec fat_stage1_5.exec ffs_stage1_5.exec \
		52	iso9660_stage1_5.exec jfs_stage1_5.exec minix_stage1_5.exec \
		53	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
		54	xfs_stage1_5.exec
		55	endif
		56	MOSTLYCLEANFILES = $(noinst_PROGRAMS)
		57
		58	PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
		59	START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
		60	NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
		61	PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
		62	START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
		63
		64	if NETBOOT_SUPPORT
65	NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
66	else
67	NETBOOT_FLAGS =
68	endif
69
70	if SERIAL_SUPPORT
71	SERIAL_FLAGS = -DSUPPORT_SERIAL=1
72	else
73	SERIAL_FLAGS =
74	endif
75
76	if HERCULES_SUPPORT
77	HERCULES_FLAGS = -DSUPPORT_HERCULES=1
78	else
79	HERCULES_FLAGS =
80	endif
81
82	if GRAPHICS_SUPPORT
83	GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
84	else
85	GRAPHICS_FLAGS =
86	endif
87
88	STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
89	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
90
91	STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
92	STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
93
94	# For stage2 target.
95	pre_stage2_exec_SOURCES = asm.S bios.c boot.c builtins.c char_io.c \
96	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
97	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
98	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
99	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
100	graphics.c
101	pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
102	pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
103	pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
104
105	if NETBOOT_SUPPORT
106	pre_stage2_exec_LDADD = ../netboot/libdrivers.a
107	endif
108
109	if DISKLESS_SUPPORT
110	BUILT_SOURCES = stage2_size.h diskless_size.h
111	else
112	BUILT_SOURCES = stage2_size.h
113	endif
114
115	CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
116
117	stage2_size.h: pre_stage2
118	-rm -f stage2_size.h
119	set dummy `ls -l pre_stage2`; \
120	echo "#define STAGE2_SIZE $$6" > stage2_size.h
121
122	start_exec_SOURCES = start.S
123	start_exec_CCASFLAGS = $(STAGE2_COMPILE)
124	start_exec_LDFLAGS = $(START_LINK)
125
126	# XXX: automake doesn't provide a way to specify dependencies for object
127	# files explicitly, so we must write this by a general Makefile scheme.
128	# If automake change the naming scheme for per-executable objects, this
129	# will be broken.
130	start_exec-start.$(OBJEXT): stage2_size.h
131
132	stage2: pre_stage2 start
133	-rm -f stage2
134	cat start pre_stage2 > stage2
135
136	start_eltorito_exec_SOURCES = start_eltorito.S
137	start_eltorito_exec_CCASFLAGS = $(STAGE2_COMPILE)
138	start_eltorito_exec_LDFLAGS = $(START_ELTORITO_LINK)
139
140	start_eltorito_exec-start.$(OBJEXT): stage2_size.h
141
142	stage2_eltorito: pre_stage2 start_eltorito
143	-rm -f stage2_eltorito
144	cat start_eltorito pre_stage2 > stage2_eltorito
145
146	# For e2fs_stage1_5 target.
147	e2fs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
148	stage1_5.c fsys_ext2fs.c bios.c
149	e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
150	-DNO_BLOCK_FILES=1
151	e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
152	-DNO_BLOCK_FILES=1
153	e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
154
155	# For fat_stage1_5 target.
156	fat_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
157	stage1_5.c fsys_fat.c bios.c
158	fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
159	-DNO_BLOCK_FILES=1
160	fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
161	-DNO_BLOCK_FILES=1
162	fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
163
164	# For ffs_stage1_5 target.
165	ffs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
166	stage1_5.c fsys_ffs.c bios.c
167	ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
168	-DNO_BLOCK_FILES=1
169	ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
170	-DNO_BLOCK_FILES=1
171	ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
172
173	# For ufs2_stage1_5 target.
174	ufs2_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
175	stage1_5.c fsys_ufs2.c bios.c
176	ufs2_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_UFS2=1 \
177	-DNO_BLOCK_FILES=1
178	ufs2_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_UFS2=1 \
179	-DNO_BLOCK_FILES=1
180	ufs2_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
181
182	# For minix_stage1_5 target.
183	minix_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
184	stage1_5.c fsys_minix.c bios.c
185	minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
186	-DNO_BLOCK_FILES=1
187	minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
188	-DNO_BLOCK_FILES=1
189	minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
190
191	# For reiserfs_stage1_5 target.
192	reiserfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
193	disk_io.c stage1_5.c fsys_reiserfs.c bios.c
194	reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
195	-DNO_BLOCK_FILES=1
196	reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
197	-DNO_BLOCK_FILES=1
198	reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
199
200	# For vstafs_stage1_5 target.
201	vstafs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
202	disk_io.c stage1_5.c fsys_vstafs.c bios.c
203	vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
204	-DNO_BLOCK_FILES=1
205	vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
206	-DNO_BLOCK_FILES=1
207	vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
208
209	# For jfs_stage1_5 target.
210	jfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
211	disk_io.c stage1_5.c fsys_jfs.c bios.c
212	jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
213	-DNO_BLOCK_FILES=1
214	jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
215	-DNO_BLOCK_FILES=1
216	jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
217
218	# For xfs_stage1_5 target.
219	xfs_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c \
220	disk_io.c stage1_5.c fsys_xfs.c bios.c
221	xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
222	-DNO_BLOCK_FILES=1
223	xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
224	-DNO_BLOCK_FILES=1
225	xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
226
227	# For iso9660_stage1_5 target.
228	iso9660_stage1_5_exec_SOURCES = start_eltorito.S asm.S common.c char_io.c \
229	disk_io.c stage1_5.c fsys_iso9660.c bios.c
230	iso9660_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_ISO9660=1 \
231	-DNO_BLOCK_FILES=1
232	iso9660_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_ISO9660=1 \
233	-DNO_BLOCK_FILES=1
234	iso9660_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
235
236	# For diskless target.
237	diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
238	diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
239	-DSUPPORT_DISKLESS=1
240	diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
241	-DSUPPORT_DISKLESS=1
242	diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
243	diskless_exec_LDADD = ../netboot/libdrivers.a
244
245	diskless_size.h: diskless
246	-rm -f $@
247	set dummy `ls -l $^`; \
248	echo "#define DISKLESS_SIZE $$6" > $@
249
250	# For nbloader target.
251	nbloader_exec_SOURCES = nbloader.S
252	nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
253	nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
254
255	# XXX: See the comment for start_exec-start.o.
256	nbloader_exec-nbloader.$(OBJEXT): diskless_size.h
257
258	# For nbgrub target.
259	nbgrub: nbloader diskless
260	-rm -f $@
261	cat $^ > $@
262
263	# For pxeloader target.
264	pxeloader_exec_SOURCES = pxeloader.S
265	pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
266	pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
267
268	# XXX: See the comment for start_exec-start.o.
269	pxeloader_exec-pxeloader.$(OBJEXT): diskless_size.h
270
271	# For pxegrub target.
272	pxegrub: pxeloader diskless
273	-rm -f $@
274	cat $^ > $@
275
276	# General rule for making a raw binary.
277	SUFFIXES = .exec
278	.exec:
279	$(OBJCOPY) -O binary $< $@

Lines 77-82 Link Here

(-)grub-0.96.orig/stage2/filesys.h (-2 / +12 lines)
77	#define FSYS_REISERFS_NUM 0	77	#define FSYS_REISERFS_NUM 0
78	#endif	78	#endif
79		79
		80	#ifdef FSYS_REISER4
		81	#define FSYS_REISER4_NUM 1
		82	int reiser4_mount (void);
		83	int reiser4_read (char *buf, int len);
		84	int reiser4_dir (char *dirname);
		85	int reiser4_embed (int *start_sector, int needed_sectors);
		86	#else
		87	#define FSYS_REISER4_NUM 0
		88	#endif
		89
80	#ifdef FSYS_VSTAFS	90	#ifdef FSYS_VSTAFS
81	#define FSYS_VSTAFS_NUM 1	91	#define FSYS_VSTAFS_NUM 1
82	int vstafs_mount (void);	92	int vstafs_mount (void);
Lines 127-134 Link Here
127	#ifndef NUM_FSYS	137	#ifndef NUM_FSYS
128	#define NUM_FSYS \	138	#define NUM_FSYS \
129	(FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM + FSYS_MINIX_NUM \	139	(FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM + FSYS_MINIX_NUM \
130	+ FSYS_REISERFS_NUM + FSYS_VSTAFS_NUM + FSYS_JFS_NUM + FSYS_XFS_NUM \	140	+ FSYS_REISERFS_NUM + FSYS_REISER4_NUM + FSYS_VSTAFS_NUM + FSYS_JFS_NUM \
131	+ FSYS_TFTP_NUM + FSYS_ISO9660_NUM + FSYS_UFS2_NUM)	141	+ FSYS_XFS_NUM + FSYS_TFTP_NUM + FSYS_ISO9660_NUM + FSYS_UFS2_NUM)
132	#endif	142	#endif
133		143
134	/* defines for the block filesystem info area */	144	/* defines for the block filesystem info area */

Line 0 Link Here

(-)grub-0.96.orig/stage2/fsys_reiser4.c (+260 lines)
		1	/*
		2	* fsys_reiser4.c -- reiser4 filesystem support.
		3	* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
		4	*
		5	* GRUB -- GRand Unified Bootloader
		6	*
		7	* This program is free software; you can redistribute it and/or modify
		8	* it under the terms of the GNU General Public License as published by
		9	* the Free Software Foundation; either version 2 of the License, or
		10	* (at your option) any later version.
		11	*
		12	* This program is distributed in the hope that it will be useful,
		13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	* GNU General Public License for more details.
		16	*
		17	* You should have received a copy of the GNU General Public License
		18	* along with this program; if not, write to the Free Software
		19	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
		20	*/
		21
		22	#ifdef FSYS_REISER4
		23	#include "shared.h"
		24	#include "filesys.h"
		25
		26	#define ENABLE_MINIMAL
		27	#include <reiser4/libreiser4.h>
		28
		29	static reiser4_fs_t *fs = NULL;
		30	static aal_device_t *dev = NULL;
		31	static reiser4_object_t *object = NULL;
		32
		33	/* Read callback of grub specific device. It uses devread() for reading passed
		34	@count of device blocks starting from @blk to passed @buff. */
		35	static errno_t grub_dev_read(aal_device_t *device,
		36	void *buff, blk_t blk,
		37	count_t count)
		38	{
		39	unsigned int size;
		40	unsigned int factor;
		41	unsigned int sector;
		42
		43	/* Calculating actual sector and size in bytes to be read from
		44	device. */
		45	factor = device->blksize / SECTOR_SIZE;
		46	sector = (unsigned int)blk << aal_log2(factor);
		47	size = (unsigned int)count * (SECTOR_SIZE * factor);
		48
		49	/* Reading from the current device */
		50	if (!devread(sector, 0, size, buff))
		51	return -EIO;
		52
		53	return 0;
		54	}
		55
		56	/* Length callback of grub device */
		57	static count_t grub_dev_len(aal_device_t *device) {
		58	unsigned int factor;
		59
		60	/* Getting partition length in device blocks */
		61	factor = device->blksize / SECTOR_SIZE;
		62	return (part_length >> aal_log2(factor));
		63	}
		64
65	/*
66	Initializing grub device abstraction instance. It will use devread and friends
67	for providing needed functionality.
68	*/
69	struct aal_device_ops grub_dev_ops = {
70	.read = grub_dev_read,
71	.len = grub_dev_len
72	};
73
74	/* Initializes reiser4 */
75	static int reiser4_init(void) {
76	extern aal_hash_table_t *plugins;
77
78	plugins = NULL;
79
80	/* Initializing memory manager */
81	aal_mem_init((void *)FSYS_BUF, FSYS_BUFLEN);
82
83	/* Initializing device abstraction on current device GRUB uses. */
84	if (!(dev = aal_device_open(&grub_dev_ops, NULL,
85	SECTOR_SIZE, 0)))
86	{
87	return 0;
88	}
89
90	/* Initializing libreiser4 (plugins, etc) */
91	return !libreiser4_init();
92	}
93
94	#define MEMORY_WATERMARK 8192
95
96	/* Memory pressure detect function. */
97	static int mpressure_detect(reiser4_tree_t *tree) {
98	return (aal_mem_free() <= MEMORY_WATERMARK);
99	}
100
101	/* Reiser4 mount() routine */
102	int reiser4_mount(void) {
103
104	/* Initialize all reiser4 related stuff first */
105	if (!reiser4_init())
106	return 0;
107
108	/* Open filesystem on @dev. */
109	if (!(fs = reiser4_fs_open(dev)))
110	return 0;
111
112	fs->tree->mpc_func = mpressure_detect;
113
114	object = NULL;
115	return 1;
116	}
117
118	/* Reiser4 read() handler */
119	int reiser4_read(char *buf, int len) {
120	int64_t read;
121
122	if (object == NULL)
123	return 0;
124
125	/* Seet at current position denoted by @filepos */
126	if (objplug(object)->o.object_ops->seek) {
127	plug_call(objplug(object)->o.object_ops,
128	seek, object->ent, filepos);
129	}
130
131	/* Reading current file data starting from @filepos */
132	disk_read_func = disk_read_hook;
133	read = objplug(object)->o.object_ops->read ?
134	plug_call(objplug(object)->o.object_ops, read,
135	object->ent, buf, len) : -EINVAL;
136	disk_read_func = NULL;
137
138	if (read < 0) {
139	errnum = ERR_FSYS_CORRUPT;
140	return 0;
141	}
142
143	filepos += read;
144	return read;
145	}
146
147	/* Reiser4 file open() routine */
148	int reiser4_dir(char *dirname) {
149	char *ch;
150
151	if (fs == NULL)
152	return 0;
153
154	if (object != NULL) {
155	plug_call(objplug(object)->o.object_ops,
156	close, object->ent);
157	aal_free(object);
158	object = NULL;
159	}
160
161	/* Cutting out string after first space character */
162	if ((ch = aal_strchr(dirname, ' ')))
163	*ch = '\0';
164
165	/* This function is also called for getting directory list for
166	maintaining the bash-like completion. */
167	#ifndef STAGE1_5
168	if (print_possibilities) {
169	char entry[256];
170	entry_hint_t entry_hint;
171
172	/* Getting last part of name (jsut after last '/') */
173	if (*(dirname + aal_strlen(dirname) - 1) != '/') {
174
175	if (!(ch = aal_strrchr(dirname, '/'))) {
176	errnum = ERR_BAD_FILETYPE;
177	return 0;
178	}
179
180	aal_strncpy(entry, ch + 1, sizeof(entry));
181	*(ch + 1) = '\0';
182	} else {
183	aal_memset(entry, 0, sizeof(entry));
184	}
185
186	/* Open obejct by @dirname */
187	if (!(object = reiser4_semantic_open(fs->tree, dirname,
188	NULL, 1)))
189	{
190	errnum = ERR_FILE_NOT_FOUND;
191	return 0;
192	}
193
194	/* Checking if it is a directory object */
195	if (object->ent->opset.plug[OPSET_OBJ]->id.group != DIR_OBJECT)
196	{
197	/* If not, cutting out last '/' character */
198	if ((ch = aal_strrchr(dirname, '/')))
199	*ch = '\0';
200
201	/* Close current object */
202	plug_call(objplug(object)->o.object_ops,
203	close, object->ent);
204	aal_free(object);
205	return 0;
206	}
207
208	/* Reading the opened directory to build the completion list. */
209	if (objplug(object)->o.object_ops->readdir) {
210	while (plug_call(objplug(object)->o.object_ops, readdir,
211	object->ent, &entry_hint) > 0)
212	{
213	if (substring(entry, entry_hint.name) <= 0) {
214	if (print_possibilities > 0)
215	print_possibilities =
216	-print_possibilities;
217
218	print_a_completion(entry_hint.name);
219	}
220	}
221	}
222	} else {
223	#endif
224	/* This is the case when resier4_dir() is called for open the
225	file @dirname, not for building completion list. */
226	if (!(object = reiser4_semantic_open(fs->tree, dirname,
227	NULL, 1)))
228	{
229	errnum = ERR_FILE_NOT_FOUND;
230	return 0;
231	}
232
233	if (object->ent->opset.plug[OPSET_OBJ]->id.group != REG_OBJECT)
234	{
235	errnum = ERR_BAD_FILETYPE;
236	return 0;
237	}
238
239	/* Initializing GRUB global variables @filepos and @filemax. */
240	filepos = 0;
241	filemax = reiser4_object_size(object);
242
243	return 1;
244	#ifndef STAGE1_5
245	}
246
247	return 1;
248	#endif
249
250	errnum = ERR_FILE_NOT_FOUND;
251	return 0;
252	}
253
254	/* Returns how many sectors may be used for embeding reiser4_stage1_5 in teh
255	case of installing GRUB to partition instead of MBR. */
256	int reiser4_embed (int *start_sector, int needed_sectors) {
257	*start_sector = 1;
258	return needed_sectors <= ((REISER4_MASTER_OFFSET >> SECTOR_BITS) - 1);
259	}
260	#endif /* FSYS_REISER4 */